diff --git a/tests/expansion.err b/tests/expansion.err
index 468f394d8..d75619e07 100644
--- a/tests/expansion.err
+++ b/tests/expansion.err
@@ -7,6 +7,12 @@ echo $foo[d]
 fish: Invalid index value
 echo ()[d]
         ^
+
+####################
+# Catch your breath
 fish: $) is not a valid variable in fish.
 echo $$paren
       ^
+
+####################
+# Test tilde expansion
diff --git a/tests/expansion.in b/tests/expansion.in
index 207b811c3..6a3832baf 100644
--- a/tests/expansion.in
+++ b/tests/expansion.in
@@ -3,90 +3,90 @@
 # We don't use the test utility function of the same name because we want
 # different behavior. Specifically, that the expansion of any variables or
 # other strings before we are invoked produce the expected expansion.
-function show --description 'Prints argument count followed by arguments'
+function expansion --description 'Prints argument count followed by arguments'
     echo (count $argv) $argv
 end
 
 set -l foo
-show "$foo"
-show $foo
-show "prefix$foo"
-show prefix$foo
+expansion "$foo"
+expansion $foo
+expansion "prefix$foo"
+expansion prefix$foo
 
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l foo ''
-show "$foo"
-show $foo
-show "prefix$foo"
-show prefix$foo
+expansion "$foo"
+expansion $foo
+expansion "prefix$foo"
+expansion prefix$foo
 
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l foo bar
 set -l bar
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l bar baz
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l bar baz quux
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l foo bar fooer fooest
 set -l fooer
 set -l fooest
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
 
 set -l fooer ''
-show $$foo
-show prefix$$foo
+expansion $$foo
+expansion prefix$$foo
 
 set -l foo bar '' fooest
-show "$$foo"
-show $$foo
-show "prefix$$foo"
-show prefix$$foo
-show $foo[-5..2]
-show $foo[-2..-1]
-show $foo[-10..-5]
-show (printf '%s\n' $foo)[-5..2]
-show (printf '%s\n' $foo)[-2..-1]
-show (printf '%s\n' $foo)[-10..-5]
+expansion "$$foo"
+expansion $$foo
+expansion "prefix$$foo"
+expansion prefix$$foo
+expansion $foo[-5..2]
+expansion $foo[-2..-1]
+expansion $foo[-10..-5]
+expansion (printf '%s\n' $foo)[-5..2]
+expansion (printf '%s\n' $foo)[-2..-1]
+expansion (printf '%s\n' $foo)[-10..-5]
 
 set -l foo
-show "$foo[1]"
-show $foo[1]
-show "$foo[-1]"
-show $foo[-1]
-show "$foo[2]"
-show $foo[2]
-show "$foo[1 2]"
-show $foo[1 2]
-show "$foo[2 1]"
-show $foo[2 1]
+expansion "$foo[1]"
+expansion $foo[1]
+expansion "$foo[-1]"
+expansion $foo[-1]
+expansion "$foo[2]"
+expansion $foo[2]
+expansion "$foo[1 2]"
+expansion $foo[1 2]
+expansion "$foo[2 1]"
+expansion $foo[2 1]
 set -l foo a b c
-show $foo[17]
-show $foo[-17]
-show $foo[17..18]
+expansion $foo[17]
+expansion $foo[-17]
+expansion $foo[17..18]
 
 echo "$foo[d]"
 echo $foo[d]
@@ -94,11 +94,11 @@ echo $foo[d]
 echo ()[1]
 echo ()[d]
 
-echo "Catch your breath"
+logmsg Catch your breath
 set paren ')'
 echo $$paren
 
-# Test tilde expansion
+logmsg Test tilde expansion
 # On OS X, /tmp is symlinked to /private/tmp
 # $PWD is our best bet for resolving it
 set -l saved $PWD
diff --git a/tests/expansion.out b/tests/expansion.out
index 3f406cb30..008a89552 100644
--- a/tests/expansion.out
+++ b/tests/expansion.out
@@ -56,4 +56,9 @@
 0
 0
 
-Catch your breath
+
+####################
+# Catch your breath
+
+####################
+# Test tilde expansion