diff --git a/ansi-tests/fboundp.lsp b/ansi-tests/fboundp.lsp
index 1ec57151c82abe69e315205d593b0b15900ce908..b7811a41ed3e346471270710fa796ce129156d5f 100644
--- a/ansi-tests/fboundp.lsp
+++ b/ansi-tests/fboundp.lsp
@@ -87,6 +87,15 @@
   t)
 
 (deftest fboundp.error.10
-  (check-type-error #'(lambda (x) (fboundp `(setf ,x)))
-		    #'symbolp)
+  (loop for x in *mini-universe*
+	unless (symbolp x)
+	nconc
+	(handler-case
+	 (list x (fboundp `(setf ,x)))
+	 (type-error (c)
+		     (assert (not (typep (type-error-datum c)
+					 (type-error-expected-type c))))
+		     nil)
+	 (error (c) (list (list x c)))))
   nil)
+
diff --git a/ansi-tests/fdefinition.lsp b/ansi-tests/fdefinition.lsp
index 97781a491bc4a6ad596b8ddb007439577e358d59..268a40868bd24b03b1b305b1a43f8450db7e48f5 100644
--- a/ansi-tests/fdefinition.lsp
+++ b/ansi-tests/fdefinition.lsp
@@ -40,7 +40,16 @@
   nil)
 
 (deftest fdefinition.error.8
-  (check-type-error #'(lambda (x) (fdefinition `(setf ,x))) #'symbolp)
+  (loop for x in *mini-universe*
+	unless (symbolp x)
+	nconc
+	(handler-case
+	 (list x (fdefinition `(setf ,x)))
+	 (type-error (c)
+		     (assert (not (typep (type-error-datum c)
+					 (type-error-expected-type c))))
+		     nil)
+	 (error (c) (list (list x c)))))
   nil)
 
 ;;; Non-error cases
diff --git a/ansi-tests/fmakunbound.lsp b/ansi-tests/fmakunbound.lsp
index e9c3b3814c3c4b1ebe4f9e1a336741fb7fe9f493..026afadaa9f1aa831e0c8f8ff8c92013210dcbfb 100644
--- a/ansi-tests/fmakunbound.lsp
+++ b/ansi-tests/fmakunbound.lsp
@@ -69,5 +69,14 @@
   t)
 
 (deftest fmakunbound.error.7
-  (check-type-error #'(lambda (x) (fmakunbound `(setf ,x)))  #'symbolp)
+  (loop for x in *mini-universe*
+	unless (symbolp x)
+	nconc
+	(handler-case
+	 (list x (fmakunbound `(setf ,x)))
+	 (type-error (c)
+		     (assert (not (typep (type-error-datum c)
+					 (type-error-expected-type c))))
+		     nil)
+	 (error (c) (list (list x c)))))
   nil)
\ No newline at end of file