diff --git a/ansi-tests/type-of.lsp b/ansi-tests/type-of.lsp
index d4df8436c87baa5e382a711e66decda62ac4a82c..0c4a5d4829e0e872ec8fd9c183a15929b1dc8f51 100644
--- a/ansi-tests/type-of.lsp
+++ b/ansi-tests/type-of.lsp
@@ -69,16 +69,19 @@
   (type-of (make-instance 'type-of.example-class))
   type-of.example-class)
 
-(defparameter *type-of.example-class-2*
-  (defclass type-of.example-class-2 () ((a) (b) (c))))
-
 (deftest type-of.8
-  (progn
-    (setf (class-name *type-of.example-class-2*) nil)
-    (eqt (type-of (make-instance *type-of.example-class-2*))
-	 *type-of.example-class-2*))
+  (let ((class (eval '(defclass type-of.example-class-2 () ((a) (b) (c))))))
+    (setf (class-name class) nil)
+    (eqt (type-of (make-instance class)) class))
+  t)
+
+(deftest type-of.9
+  (let ((class (eval '(defclass type-of.example-class-3 () ((a) (b) (c))))))
+    (setf (find-class 'type-of.example-class-3) nil)
+    (eqt (type-of (make-instance class)) class))
   t)
 
+
 ;;; Error tests
 
 (deftest type-of.error.1