diff --git a/ansi-tests/subtypep.lsp b/ansi-tests/subtypep.lsp
index 740db508312d59daf1b74ba1955111688a33a9df..e46221b9f9946aff157e2d48ff5da38fbed0f614 100644
--- a/ansi-tests/subtypep.lsp
+++ b/ansi-tests/subtypep.lsp
@@ -192,5 +192,9 @@
 	append (check-all-not-subtypep type nil))
   nil)
 
-	
-  
\ No newline at end of file
+(deftest subtypep.nil.2
+  (loop for (type) in *subtype-table*
+	for class = (find-class type nil)
+	unless (or (not class) (member type '(nil extended-char)))
+	append (check-all-not-subtypep class nil))
+  nil)
diff --git a/ansi-tests/types-and-class.lsp b/ansi-tests/types-and-class.lsp
index 8918ce1da1c5e9f6268d5029bc60a3c461da5543..6f458e7542b6fae111c3dcfd48262562dbe3e813 100644
--- a/ansi-tests/types-and-class.lsp
+++ b/ansi-tests/types-and-class.lsp
@@ -161,7 +161,14 @@
   0)
 
 
-
+;;; All class names in CL denote classes that are subtypep
+;;; equivalent to themselves
+(deftest all-classes-are-type-equivalent-to-their-names
+  (loop for sym being  the external-symbols of "COMMON-LISP"
+       for class = (find-class sym nil)
+       when class
+       append (check-equivalence sym class))
+  nil)
 
 ;;; Check that all class names in CL that name standard-classes or
 ;;; structure-classes are subtypes of standard-object and structure-object,