diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp
index 064c59ac2260c89b2277ba653280c0c4598a9cc9..bd888ea000e087fe2ea184da08616f38086d6554 100644
--- a/ansi-tests/ansi-aux.lsp
+++ b/ansi-tests/ansi-aux.lsp
@@ -215,19 +215,29 @@ the condition to go uncaught if it cannot be classified."
 	       (rotatef (elt seq r) (elt seq (1- i))))))
   seq)
 
-(defconstant +standard-chars+
+(defparameter +standard-chars+
   "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~!@#$%^&*()_+|\\=-`{}[]:\";'<>?,./ 
 ")
 
-(defconstant +alpha-chars+ (subseq +standard-chars+ 0 52))
-(defconstant +lower-case-chars+ (subseq +alpha-chars+ 0 26))
-(defconstant +upper-case-chars+ (subseq +alpha-chars+ 26 52))
-(defconstant +alphanumeric-chars+ (subseq +standard-chars+ 0 62))
-(defconstant +digit-chars+ "0123456789")
-(defconstant +extended-digit-chars+ "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-(defconstant +code-chars+
+(defparameter
+  +base-chars+ #.(concatenate 'string
+			      "abcdefghijklmnopqrstuvwxyz"
+			      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			      "0123456789"
+			      "<,>.?/\"':;[{]}~`!@#$%^&*()_-+= \\|"))
+
+(defparameter +num-base-chars+ (length +base-chars+))
+
+
+(defparameter +alpha-chars+ (subseq +standard-chars+ 0 52))
+(defparameter +lower-case-chars+ (subseq +alpha-chars+ 0 26))
+(defparameter +upper-case-chars+ (subseq +alpha-chars+ 26 52))
+(defparameter +alphanumeric-chars+ (subseq +standard-chars+ 0 62))
+(defparameter +digit-chars+ "0123456789")
+(defparameter +extended-digit-chars+ "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+(defparameter +code-chars+
   (coerce (loop for i from 0 below 256
 		for c = (code-char i)
 		when c collect c)
 	  'string))
-(defconstant +rev-code-chars+ (reverse +code-chars+))
+(defparameter +rev-code-chars+ (reverse +code-chars+))
diff --git a/ansi-tests/cl-symbols.lsp b/ansi-tests/cl-symbols.lsp
index 1fde8ac5b8bb172a0a58c2acc985cabf546f69d7..6bcf2bfec1318ed001344576642dac8c58730043 100644
--- a/ansi-tests/cl-symbols.lsp
+++ b/ansi-tests/cl-symbols.lsp
@@ -1048,7 +1048,7 @@
 
 
 ;;; See section 3.1.2.1.2.1
-(defconstant +special-operators+
+(defparameter +special-operators+
   '(block let* return-from catch load-time-value setq eval-when
 	  locally symbol-macrolet flet macrolet tagbody function
 	  multiple-value-call the go multiple-value-prog1 throw if
diff --git a/ansi-tests/defconstant.lsp b/ansi-tests/defconstant.lsp
index 825226c9561c3735ae9b3c40603a1111c32fe217..50760ca3d8845619d4df46b5f6a9cc69fe28d557 100644
--- a/ansi-tests/defconstant.lsp
+++ b/ansi-tests/defconstant.lsp
@@ -19,7 +19,9 @@
   (documentation 'test-constant-1 'variable)
   nil)
 
-(defconstant test-constant-2  'a "This is the documentation.")
+(defconstant test-constant-2  'a
+  (if (boundp test-constant-2) test-constant-2
+    "This is the documentation."))
 
 (deftest defconstant.4
   (documentation 'test-constant-2 'variable)
diff --git a/ansi-tests/random-intern.lsp b/ansi-tests/random-intern.lsp
index 2688cad26f8c16d06dc2113ee86c60b2edf1b47d..80bda183aa970fb082dc11d2edb8a5b2f1123940 100644
--- a/ansi-tests/random-intern.lsp
+++ b/ansi-tests/random-intern.lsp
@@ -5,14 +5,6 @@
 
 (in-package :cl-test)
 
-(defconstant
-  +base-chars+ #.(concatenate 'string
-			      "abcdefghijklmnopqrstuvwxyz"
-			      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-			      "0123456789"
-			      "<,>.?/\"':;[{]}~`!@#$%^&*()_-+= \\|"))
-(defconstant +num-base-chars+ (length +base-chars+))
-
 (defconstant +max-len-random-symbol+ 63)
 
 (defun make-random-symbol (package)
diff --git a/ansi-tests/types-and-class.lsp b/ansi-tests/types-and-class.lsp
index 9e4e3637d07fcf7b9af5527f3e5ed896b6cab9eb..2ebae61f3aa665390f5700c81ef8fc720ade7f83 100644
--- a/ansi-tests/types-and-class.lsp
+++ b/ansi-tests/types-and-class.lsp
@@ -156,7 +156,8 @@
      *subtype-table*)
   0)
 
-(defconstant +float-types+ '(long-float double-float short-float single-float))
+(defparameter +float-types+
+  '(long-float double-float short-float single-float))
 
 (defun types-4-body ()
   (let ((parent-table (make-hash-table :test #'equal))