diff --git a/tests/checks/switch.fish b/tests/checks/switch.fish
index 6c6eb445a..4898f7d93 100644
--- a/tests/checks/switch.fish
+++ b/tests/checks/switch.fish
@@ -69,3 +69,34 @@ end
 #CHECKERR: fish: 'case' builtin not inside of switch block
 #CHECKERR:      case a
 #CHECKERR:           ^
+
+set smurf green
+
+switch $smurf;
+	case "*ee*"
+		echo Test 1 pass
+	case "*"
+		echo Test 1 fail
+end;
+#CHECK: Test 1 pass
+
+switch $smurf
+	case *ee*
+		echo Test 2 fail
+	case red green blue
+		echo Test 2 pass
+	case "*"
+		echo Test 2 fail
+end
+#CHECKERR: {{.*}}switch.fish (line {{\d+}}): No matches for wildcard '*ee*'. See `help expand`.
+#CHECKERR: case *ee*
+#CHECKERR: ^
+#CHECK: Test 2 pass
+
+switch $smurf
+	case cyan magenta yellow
+		echo Test 3 fail
+	case "*"
+		echo Test 3 pass
+end
+#CHECK: Test 3 pass
diff --git a/tests/checks/wildcard.fish b/tests/checks/wildcard.fish
index 0384c63de..a9d049157 100644
--- a/tests/checks/wildcard.fish
+++ b/tests/checks/wildcard.fish
@@ -15,3 +15,17 @@ echo $dirs/*.txt
 
 cd $oldpwd
 rm -Rf $dir
+
+
+# Verify that we can do wildcard expansion when we
+# don't have read access to some path components
+# See #2099
+set -l where ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess
+mkdir -p $where
+chmod 300 (dirname $where) # no read permissions
+mkdir -p $where
+touch $where/alpha.txt $where/beta.txt $where/delta.txt
+echo $where/*
+#CHECK: ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/alpha.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/beta.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/delta.txt
+chmod 700 (dirname $where) # so we can delete it
+rm -rf ../test/temp/fish_wildcard_permissions_test
diff --git a/tests/test5.err b/tests/test5.err
deleted file mode 100644
index f0a464ce3..000000000
--- a/tests/test5.err
+++ /dev/null
@@ -1,3 +0,0 @@
-fish: No matches for wildcard '*ee*'. See `help expand`.
-	case *ee*
-	     ^
diff --git a/tests/test5.in b/tests/test5.in
deleted file mode 100644
index 54b2b3693..000000000
--- a/tests/test5.in
+++ /dev/null
@@ -1,37 +0,0 @@
-
-set smurf green
-
-switch $smurf;
-	case "*ee*"
-		echo Test 1 pass
-	case "*"
-		echo Test 1 fail
-end;
-
-switch $smurf
-	case *ee*
-		echo Test 2 fail
-	case red green blue
-		echo Test 2 pass
-	case "*"
-		echo Test 2 fail
-end
-
-switch $smurf
-	case cyan magenta yellow
-		echo Test 3 fail
-	case "*"
-		echo Test 3 pass
-end
-
-# Verify that we can do wildcard expansion when we
-# don't have read access to some path components
-# See #2099
-set -l where ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess
-mkdir -p $where
-chmod 300 (dirname $where) # no read permissions
-mkdir -p $where
-touch $where/alpha.txt $where/beta.txt $where/delta.txt
-echo $where/*
-chmod 700 (dirname $where) # so we can delete it
-rm -rf ../test/temp/fish_wildcard_permissions_test
diff --git a/tests/test5.out b/tests/test5.out
deleted file mode 100644
index 70f1ec81b..000000000
--- a/tests/test5.out
+++ /dev/null
@@ -1,4 +0,0 @@
-Test 1 pass
-Test 2 pass
-Test 3 pass
-../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/alpha.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/beta.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/delta.txt