diff --git a/tests/filesys.test.sh b/tests/filesys.test.sh
index 7a8fef3dc..67b045957 100755
--- a/tests/filesys.test.sh
+++ b/tests/filesys.test.sh
@@ -13,6 +13,9 @@
 
 . ./subr.sh
 
+run_sbcl --eval '(exit :code (or #+unix 0 2))'
+if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
+
 use_test_subdirectory
 testdir="`pwd -P`" # resolve symbolic links in the directory.
 
diff --git a/tests/run-sbcl.test.sh b/tests/run-sbcl.test.sh
index 98995bf38..b10191ad0 100644
--- a/tests/run-sbcl.test.sh
+++ b/tests/run-sbcl.test.sh
@@ -1,7 +1,10 @@
-set -e
-
 . ./subr.sh
 
+run_sbcl --eval '(exit :code (or #+unix 0 2))'
+if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
+
+set -e
+
 # run-sbcl.sh's pathname munging turns out always to have been
 # insufficient in one way or another.
 test_run_sbcl() (
diff --git a/tests/run-tests.lisp b/tests/run-tests.lisp
index 8ac3756ed..cfeb4509d 100644
--- a/tests/run-tests.lisp
+++ b/tests/run-tests.lisp
@@ -658,21 +658,4 @@
   (filter-test-files "*.impure-cload.lisp"))
 
 (defun sh-files ()
-  (let ((result (filter-test-files "*.test.sh")))
-    #+unix result
-    ;; Rather than hack up the shell scripts which don't pass on #-unix
-    ;; (which would require at least a few lines of shell script and lisp
-    ;; to invoke SBCL and exit with some other code), just confine the kludge
-    ;; to this file.
-    #-unix
-    (if *explicit-test-files*
-        result
-      (remove-if
-       (lambda (x)
-         (member (pathname-name x)
-                 '("filesys.test" ; too many assertions about symlinks to care about just yet
-                   ;; No built SBCL here (.../tests/run-sbcl-test-5863): run 'sh make.sh' first!
-                   "run-sbcl.test"
-                   "side-effectful-pathnames.test") ; no idea
-                 :test 'string=))
-        result))))
+  (filter-test-files "*.test.sh"))
diff --git a/tests/side-effectful-pathnames.test.sh b/tests/side-effectful-pathnames.test.sh
index fa4b65993..52855700c 100644
--- a/tests/side-effectful-pathnames.test.sh
+++ b/tests/side-effectful-pathnames.test.sh
@@ -13,6 +13,9 @@
 
 . ./subr.sh
 
+run_sbcl --eval '(exit :code (or #+unix 0 2))'
+if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
+
 use_test_subdirectory
 testdir="`pwd -P`" # resolve symbolic links in the directory.