diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
index 86ec3c6c6..9552f5a4e 100644
--- a/tests/checks/eval.fish
+++ b/tests/checks/eval.fish
@@ -31,7 +31,7 @@ echo $status
 # CHECK: 123
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): The expanded command was empty.
 # CHECKERR: ""
-# CHECKERR: ^
+# CHECKERR: ^^
 
 function empty
 end
diff --git a/tests/checks/status-value.fish b/tests/checks/status-value.fish
index a0f65f3cc..21c02a0a9 100644
--- a/tests/checks/status-value.fish
+++ b/tests/checks/status-value.fish
@@ -7,7 +7,7 @@ echo $status
 # CHECK: 123
 # CHECKERR: {{.*}} The expanded command was empty.
 # CHECKERR: $empty_var
-# CHECKERR: ^
+# CHECKERR: ^~~~~~~~~^
 
 # Failed expansions
 echo "$abc["
diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index a8795423f..d42130739 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -46,4 +46,5 @@ $fish -c 'time true&'
 $fish -c 'not time true&'
 #CHECKERR: fish: {{.*}}
 #CHECKERR: not time true&
-#CHECKERR: ^
+#FIXME: This error marks the entire statement. Would be cool to mark just `time true&`.
+#CHECKERR: ^~~~~~~~~~~~~^
diff --git a/tests/checks/vars_as_commands.fish b/tests/checks/vars_as_commands.fish
index 6ab3bdee0..b243e0cfd 100644
--- a/tests/checks/vars_as_commands.fish
+++ b/tests/checks/vars_as_commands.fish
@@ -4,11 +4,11 @@
 $EMPTY_VARIABLE
 #CHECKERR: {{.*}}checks/vars_as_commands.fish (line {{\d+}}): The expanded command was empty.
 #CHECKERR: $EMPTY_VARIABLE
-#CHECKERR: ^
+#CHECKERR: ^~~~~~~~~~~~~~^
 "$EMPTY_VARIABLE"
 #CHECKERR: {{.*}}checks/vars_as_commands.fish (line {{\d+}}): The expanded command was empty.
 #CHECKERR: "$EMPTY_VARIABLE"
-#CHECKERR: ^
+#CHECKERR: ^~~~~~~~~~~~~~~~^
 
 set CMD1 echo basic command as variable
 $CMD1