diff --git a/ansi-tests/block.lsp b/ansi-tests/block.lsp
index b45b6d18138a9259bf61325b83f9fb1c2fed33d6..b68d9dfff4f040b0d46ca04fe5e366e79734caa9 100644
--- a/ansi-tests/block.lsp
+++ b/ansi-tests/block.lsp
@@ -63,3 +63,11 @@
       (block done (mapcar #'%f '(good bad bad))))
     'bad)
   good)
+
+#|
+(deftest return.error.1
+  (classify-error
+   (block nil
+     (return 'a 'b)))
+  program-error)
+|#
diff --git a/ansi-tests/case.lsp b/ansi-tests/case.lsp
index 0f170d66838186179cab9bf312733c5d877ec4ad..3118ccc7f76eccce3a0555856c8f7d34d8e930f3 100644
--- a/ansi-tests/case.lsp
+++ b/ansi-tests/case.lsp
@@ -166,6 +166,6 @@
   (case 'a (b 'b) (otherwise))
   nil)
 
-(deftest case.error.1
-  (classify-error (case))
-  program-error)
+;;; (deftest case.error.1
+;;;  (classify-error (case))
+;;;  program-error)
diff --git a/ansi-tests/ccase.lsp b/ansi-tests/ccase.lsp
index 58cef3cffa465d89b856926b8380a7d28131c226..8bbc4455be38dd21e8d312aef0a4c7c8a6bb4110 100644
--- a/ansi-tests/ccase.lsp
+++ b/ansi-tests/ccase.lsp
@@ -181,9 +181,9 @@
       (2 nil))))
   :good)
 
-(deftest ccase.error.1
-  (classify-error (ccase))
-  program-error)
+;;; (deftest ccase.error.1
+;;;  (classify-error (ccase))
+;;;  program-error)
 
 
     
diff --git a/ansi-tests/ctypecase.lsp b/ansi-tests/ctypecase.lsp
index 00416b3d9ef63b6aa3b08595748a9566115b0abf..c49a4412a922ced93e3b45dbfb140501d52efb14 100644
--- a/ansi-tests/ctypecase.lsp
+++ b/ansi-tests/ctypecase.lsp
@@ -75,6 +75,6 @@
      x))
   :good a)
 
-(deftest ctypecase.error.1
-  (classify-error (ctypecase))
-  program-error)
+;;; (deftest ctypecase.error.1
+;;;  (classify-error (ctypecase))
+;;;  program-error)
diff --git a/ansi-tests/defconstant.lsp b/ansi-tests/defconstant.lsp
index 2c40ffd83ad6e441dbd31ebe4cca1ce551474b56..6c4ffe2a48f6f04cab906c432b669783732b03cb 100644
--- a/ansi-tests/defconstant.lsp
+++ b/ansi-tests/defconstant.lsp
@@ -30,16 +30,16 @@
   (defconstant test-constant-3 0)
   test-constant-3)
 
-(deftest defconstant.error.1
-  (classify-error (defconstant))
-  program-error)
-
-(deftest defconstant.error.2
-  (classify-error (defconstant +ignorable-constant-name+))
-  program-error)
-
-(deftest defconstant.error.3
-  (classify-error (defconstant +ignorable-constant-name2+ nil
-		    "This is a docstring"
-		    "This is an unnecessary extra argument."))
-  program-error)
\ No newline at end of file
+;;; (deftest defconstant.error.1
+;;;   (classify-error (defconstant))
+;;;   program-error)
+;;; 
+;;; (deftest defconstant.error.2
+;;;   (classify-error (defconstant +ignorable-constant-name+))
+;;;   program-error)
+;;; 
+;;; (deftest defconstant.error.3
+;;;   (classify-error (defconstant +ignorable-constant-name2+ nil
+;;; 		    "This is a docstring"
+;;; 		    "This is an unnecessary extra argument."))
+;;;   program-error)
\ No newline at end of file
diff --git a/ansi-tests/define-modify-macro.lsp b/ansi-tests/define-modify-macro.lsp
index 3be06e6bdf2b867728350b2558336e103649114a..e1d43814fa13aeebcb2c4c7bbd343ca1f8b78ad8 100644
--- a/ansi-tests/define-modify-macro.lsp
+++ b/ansi-tests/define-modify-macro.lsp
@@ -64,20 +64,20 @@
   new-incf2
   (3 #(0 0 3 0 0) 3))
 
-(deftest define-modify-macro.error.1
-  (classify-error (define-modify-macro))
-  program-error)
-
-(deftest define-modify-macro.error.2
-  (classify-error (define-modify-macro dfm-error-1))
-  program-error)
-
-(deftest define-modify-macro.error.3
-  (classify-error (define-modify-macro dfm-error-2 ()))
-  program-error)
-
-(deftest define-modify-macro.error.4
-  (classify-error (define-modify-macro dfm-error-2 () nil "Documentation"
-		    "extra illegal argument"))
-  program-error)
+;;; (deftest define-modify-macro.error.1
+;;;   (classify-error (define-modify-macro))
+;;;   program-error)
+;;; 
+;;; (deftest define-modify-macro.error.2
+;;;   (classify-error (define-modify-macro dfm-error-1))
+;;;   program-error)
+;;; 
+;;; (deftest define-modify-macro.error.3
+;;;   (classify-error (define-modify-macro dfm-error-2 ()))
+;;;   program-error)
+;;; 
+;;; (deftest define-modify-macro.error.4
+;;;   (classify-error (define-modify-macro dfm-error-2 () nil "Documentation"
+;;; 		    "extra illegal argument"))
+;;;   program-error)
 
diff --git a/ansi-tests/defparameter.lsp b/ansi-tests/defparameter.lsp
index 0b17aa93f899996304efbaa1ceafd8b924060812..4cc3c908b9ed70e767fd7efd5aef1aaee54ce0c3 100644
--- a/ansi-tests/defparameter.lsp
+++ b/ansi-tests/defparameter.lsp
@@ -51,16 +51,16 @@
   "And ever."
   300)
 
-(deftest defparameter.error.1
-  (classify-error (defparameter))
-  program-error)
-
-(deftest defparameter.error.2
-  (classify-error (defparameter *ignored-defparameter-name*))
-  program-error)
-
-(deftest defparameter.error.3
-  (classify-error (defparameter *ignored-defparameter-name* nil
-		    "documentation"
-		    "illegal extra argument"))
-  program-error)
+;;; (deftest defparameter.error.1
+;;;   (classify-error (defparameter))
+;;;   program-error)
+;;; 
+;;; (deftest defparameter.error.2
+;;;   (classify-error (defparameter *ignored-defparameter-name*))
+;;;   program-error)
+;;; 
+;;; (deftest defparameter.error.3
+;;;   (classify-error (defparameter *ignored-defparameter-name* nil
+;;; 		    "documentation"
+;;; 		    "illegal extra argument"))
+;;;   program-error)
diff --git a/ansi-tests/defvar.lsp b/ansi-tests/defvar.lsp
index 6821fd1c1f48c50a3484e2547b488480f6e44f80..02aadc83a61ee78f8e77e967ae8ff663a09336dd 100644
--- a/ansi-tests/defvar.lsp
+++ b/ansi-tests/defvar.lsp
@@ -54,11 +54,11 @@
   200
   0)
 
-(deftest defvar.error.1
-  (classify-error (defvar))
-  program-error)
-
-(deftest defvar.error.2
-  (classify-error (defvar *ignored-defvar-name* nil "documentation"
-		    "illegal extra argument"))
-  program-error)
+;;; (deftest defvar.error.1
+;;;   (classify-error (defvar))
+;;;   program-error)
+;;; 
+;;; (deftest defvar.error.2
+;;;   (classify-error (defvar *ignored-defvar-name* nil "documentation"
+;;; 		    "illegal extra argument"))
+;;;   program-error)
diff --git a/ansi-tests/destructuring-bind.lsp b/ansi-tests/destructuring-bind.lsp
index f42426fdfa7addf9632c7430f3035e29a6473aa4..240e52f29774f5c700d51e2030aecd5936202b0d 100644
--- a/ansi-tests/destructuring-bind.lsp
+++ b/ansi-tests/destructuring-bind.lsp
@@ -97,3 +97,12 @@
 (deftest destructuring-bind.error.4
   (classify-error (destructuring-bind (a . b) 'x (list a b)))
   program-error)
+
+(deftest destructuring-bind.error.5
+  (classify-error (destructuring-bind))
+  program-error)
+
+(deftest destructuring-bind.error.6
+  (classify-error (destructuring-bind x))
+  program-error)
+