diff --git a/tests/checks/features-nocaret5.fish b/tests/checks/features-nocaret5.fish
index 0dc3c25f6..fedbfb74f 100644
--- a/tests/checks/features-nocaret5.fish
+++ b/tests/checks/features-nocaret5.fish
@@ -1,2 +1,2 @@
 #RUN: %fish --features no-stderr-nocaret -c 'ls /abavojijsdfhdsjhfuihifoisj ^&1'
-# CHECK: ls: {{.*}}
+# CHECK: {{ls|/abavojijsdfhdsjhfuihifoisj}}: {{.*}}
diff --git a/tests/checks/pipestatus.fish b/tests/checks/pipestatus.fish
index 30fa24901..13679cadb 100644
--- a/tests/checks/pipestatus.fish
+++ b/tests/checks/pipestatus.fish
@@ -18,13 +18,13 @@ echo $pipestatus : $status
 # Note: On some systems `command false` fails with 255, not 1. We allow both.
 command false | command false | command false
 echo $pipestatus : $status
-#CHECK: {{1|255}} {{1|255}} {{1|255}} : 1
+#CHECK: {{1|255}} {{1|255}} {{1|255}} : {{1|255}}
 command true | command true | command true
 echo $pipestatus : $status
 #CHECK: 0 0 0 : 0
 command false | command true | command false
 echo $pipestatus : $status
-#CHECK: {{1|255}} 0 {{1|255}} : 1
+#CHECK: {{1|255}} 0 {{1|255}} : {{1|255}}
 command true | command false | command true
 echo $pipestatus : $status
 #CHECK: 0 {{1|255}} 0 : 0
@@ -38,7 +38,7 @@ echo $pipestatus : $status
 #CHECK: 0 0 0 : 0
 false | command true | command false
 echo $pipestatus : $status
-#CHECK: 1 0 {{1|255}} : 1
+#CHECK: 1 0 {{1|255}} : {{1|255}}
 true | false | command true
 echo $pipestatus : $status
 #CHECK: 0 1 0 : 0
@@ -64,7 +64,7 @@ echo $pipestatus : $status
 #CHECK: 0 : 0
 command false
 echo $pipestatus : $status
-#CHECK: {{1|255}} : 1
+#CHECK: {{1|255}} : {{1|255}}
 sh -c 'exit 4'
 echo $pipestatus : $status
 #CHECK: 4 : 4
diff --git a/tests/checks/signal.fish b/tests/checks/signal.fish
index beeecba97..20d0fd6c2 100644
--- a/tests/checks/signal.fish
+++ b/tests/checks/signal.fish
@@ -36,7 +36,8 @@ end
 echo "command false:"
 command false
 # CHECK: command false:
-# CHECK: PROCESS_EXIT 1
+# (Solaris' false exits with 255, not 1)
+# CHECK: PROCESS_EXIT {{1|255}}
 # CHECK: JOB_EXIT 0
 
 echo "command true:"
@@ -48,7 +49,7 @@ command true
 echo "command false | true:"
 command false | command true
 # CHECK: command false | true:
-# CHECK: PROCESS_EXIT 1
+# CHECK: PROCESS_EXIT {{1|255}}
 # CHECK: PROCESS_EXIT 0
 # CHECK: JOB_EXIT 0
 
diff --git a/tests/checks/wait.fish b/tests/checks/wait.fish
index 05f7ae549..15af742aa 100644
--- a/tests/checks/wait.fish
+++ b/tests/checks/wait.fish
@@ -35,4 +35,5 @@ sleep .1
 function waiter --on-process-exit $pid
     echo exited $argv
 end
-# CHECK: exited PROCESS_EXIT {{\d+}} 1
+# (Solaris' false exits with 255, not 1)
+# CHECK: exited PROCESS_EXIT {{\d+}} {{1|255}}