diff --git a/tests/test1.err b/tests/test1.err
index e69de29bb..fff85a472 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -0,0 +1,42 @@
+
+####################
+# Comments in odd places don't cause problems
+
+####################
+# Bracket expansion
+
+####################
+# Escaped newlines
+
+####################
+# Simple function tests
+
+####################
+# Ensure eval doesn't unnecessarily mess with the exit status
+
+####################
+# Verify that we can turn stderr into stdout and then pipe it
+
+####################
+# Test that trailing ^ doesn't trigger redirection, see #1873
+
+####################
+# Verify that we can pipe something other than stdout
+
+####################
+# echo tests
+
+####################
+# Verify that pipes don't conflict with fd redirections
+
+####################
+# Make sure while loops don't run forever with no-exec (#1543)
+
+####################
+# Comments allowed in between lines (#1987)
+
+####################
+# Backslashes are part of comments and do not join lines (#1255)
+
+####################
+# Verify $argv set correctly in sourced scripts (#139)
diff --git a/tests/test1.in b/tests/test1.in
index 47ff18809..b002b48f1 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -1,21 +1,22 @@
 #
-#Test function, loops, conditionals and some basic elements
+# Test function, loops, conditionals and some basic elements
 #
 
-for i in 1 2 #Comment on same line as command
-#Comment inside loop
+logmsg "Comments in odd places don't cause problems"
+for i in 1 2 # Comment on same line as command
+# Comment inside loop
     for j in a b
-		#Double loop
+		# Double loop
         echo $i$j
 	end;
 end
 
-# Bracket expansion
+logmsg Bracket expansion
 echo x-{1}
 echo x-{1,2}
 echo foo-{1,2{3,4}}
 
-# Escaped newlines
+logmsg Escaped newlines
 echo foo\ bar
 echo foo\
 bar
@@ -30,7 +31,7 @@ for i in \
 end
 
 
-# Simple function tests
+logmsg Simple function tests
 
 function foo
     echo >../test/temp/fish_foo.txt $argv
@@ -83,7 +84,7 @@ else
 end
 echo Test 4 $sta
 
-# Ensure eval doesn't unnecessarily mess with the exit status
+logmsg "Ensure eval doesn't unnecessarily mess with the exit status"
 function empty_func ; end
 false ; eval empty_func ; echo $status
 true ; eval empty_func ; echo $status
@@ -99,23 +100,21 @@ else
 end
 echo Test 5 $sta
 
-# Verify that we can turn stderr into stdout and then pipe it.
+logmsg Verify that we can turn stderr into stdout and then pipe it
 # Note that the order here seems unspecified - 'errput' appears before 'output', why?
-echo Test redirections
 begin ; echo output ; echo errput 1>&2  ; end 2>&1 | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
 
-# Test that trailing ^ doesn't trigger redirection, see #1873
+logmsg "Test that trailing ^ doesn't trigger redirection, see #1873"
 echo caret_no_redirect 12345^
 
-# Verify that we can pipe something other than stdout
+logmsg Verify that we can pipe something other than stdout
 # The first line should be printed, since we output to stdout but pipe stderr to /dev/null
 # The second line should not be printed, since we output to stderr and pipe it to /dev/null
 begin ; echo is_stdout ; end 2>| cat > /dev/null
 begin ; echo is_stderr 1>&2 ; end 2>| cat > /dev/null
 
-# echo tests
-echo
-echo '# echo tests'
+####################
+logmsg echo tests
 echo 'abc\ndef'
 echo -e 'abc\ndef'
 echo -e 'abc\zdef'
@@ -132,7 +131,7 @@ echo -e Catch your breath
 echo -e 'abc\x21def'
 echo -e 'abc\x211def'
 
-# Verify that pipes don’t conflict with fd redirections
+logmsg "Verify that pipes don't conflict with fd redirections"
 # This code is very similar to eval. We go over a bunch of fads
 # to make it likely that we will nominally conflict with a pipe
 # fish is supposed to detect this case and dup the pipe to something else
@@ -148,16 +147,16 @@ echo "/bin/echo pipe 11 <&11 11<&-" | source 11<&0
 echo "/bin/echo pipe 12 <&12 12<&-" | source 12<&0
 
 
-# Make sure while loops don't run forever with no-exec (#1543)
+logmsg "Make sure while loops don't run forever with no-exec (#1543)"
 echo "Checking for infinite loops in no-execute"
 echo "while true; end" | ../test/root/bin/fish --no-execute
 
-# Comments allowed in between lines (#1987)
+logmsg 'Comments allowed in between lines (#1987)'
 echo before comment \
   # comment
   after comment
 
-# Backslashes are part of comments and do not join lines (#1255)
+logmsg 'Backslashes are part of comments and do not join lines (#1255)'
 # This should execute false, not echo it
 echo -n # comment\
 false
@@ -168,11 +167,11 @@ function always_fails
     end
 end
 
-# Verify $argv set correctly in sourced scripts.
-# Issue #139
+logmsg 'Verify $argv set correctly in sourced scripts (#139)'
 echo 'echo "source argv {$argv}"' | source
 echo 'echo "source argv {$argv}"' | source -
 echo 'echo "source argv {$argv}"' | source - abc
 echo 'echo "source argv {$argv}"' | source - abc def
 
-always_fails ; echo $status
+always_fails
+echo $status
diff --git a/tests/test1.out b/tests/test1.out
index 63f84b048..64a5dbc30 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -1,10 +1,19 @@
+
+####################
+# Comments in odd places don't cause problems
 1a
 1b
 2a
 2b
+
+####################
+# Bracket expansion
 x-1
 x-1 x-2
 foo-1 foo-23 foo-24
+
+####################
+# Escaped newlines
 foo bar
 foobar
 foobar
@@ -13,21 +22,36 @@ bar
 a
 b
 c
+
+####################
+# Simple function tests
 Test 2 pass
 Test 3a pass
 Test 3b pass
 Test 4 pass
+
+####################
+# Ensure eval doesn't unnecessarily mess with the exit status
 1
 0
 Test 5 pass
-Test redirections
+
+####################
+# Verify that we can turn stderr into stdout and then pipe it
 errput
 output
 errput
 output
+
+####################
+# Test that trailing ^ doesn't trigger redirection, see #1873
 caret_no_redirect 12345^
+
+####################
+# Verify that we can pipe something other than stdout
 is_stdout
 
+####################
 # echo tests
 abc\ndef
 abc
@@ -45,6 +69,9 @@ abc
 Catch your breath
 abc!def
 abc!1def
+
+####################
+# Verify that pipes don't conflict with fd redirections
 pipe 3
 pipe 4
 pipe 5
@@ -55,8 +82,20 @@ pipe 9
 pipe 10
 pipe 11
 pipe 12
+
+####################
+# Make sure while loops don't run forever with no-exec (#1543)
 Checking for infinite loops in no-execute
+
+####################
+# Comments allowed in between lines (#1987)
 before comment after comment
+
+####################
+# Backslashes are part of comments and do not join lines (#1255)
+
+####################
+# Verify $argv set correctly in sourced scripts (#139)
 source argv {}
 source argv {}
 source argv {abc}