diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp
index 549cd6b47c6d9fa979f4f8174f5cb6e776658854..3ca2ca84f6ea340805d7f98675ba18984d6890f9 100644
--- a/ansi-tests/ansi-aux.lsp
+++ b/ansi-tests/ansi-aux.lsp
@@ -1066,8 +1066,3 @@ the condition to go uncaught if it cannot be classified."
   (let ((eps 1.0d-4))
     (<= (abs (- x y))
        (* eps (max (abs x) (abs y))))))
-
-
-
-    
-    
\ No newline at end of file
diff --git a/ansi-tests/find-symbol.lsp b/ansi-tests/find-symbol.lsp
index 99f5a44ed092f01381f2668930b7832df66513d7..3d7eb08c2544d3c3f8dec248ec5571711bffdec6 100644
--- a/ansi-tests/find-symbol.lsp
+++ b/ansi-tests/find-symbol.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "packages-00.lsp")
+(load "packages-00.lsp")
 
 ;;(declaim (optimize (safety 3)))
 
diff --git a/ansi-tests/make-package.lsp b/ansi-tests/make-package.lsp
index 86238030f371ee807b1fa0066ac029a105c2d152..51f8a3c06ce2e057222362075b47f1b44e7229a2 100644
--- a/ansi-tests/make-package.lsp
+++ b/ansi-tests/make-package.lsp
@@ -467,7 +467,7 @@
 (deftest make-package.error.4
   (handle-non-abort-restart
    (safely-delete-package "TEST1")
-   (safely-delete-package "Q")
+   (set-up-packages)
    (make-package "TEST1" :nicknames '("Q")))
   success)
 
diff --git a/ansi-tests/package-name.lsp b/ansi-tests/package-name.lsp
index 7fdffe077efe6f1c946e13ffedf587c370fba7c2..5115a1f1aa73d41357cf9c32db38b26229bc8564 100644
--- a/ansi-tests/package-name.lsp
+++ b/ansi-tests/package-name.lsp
@@ -10,19 +10,27 @@
 ;;; package-name
 
 (deftest package-name.1
-  (let () (ignore-errors (package-name "A")))
+  (progn
+    (set-up-packages)
+    (package-name "A"))
   "A")
 
 (deftest package-name.2
-  (let () (ignore-errors (package-name #\A)))
+  (progn
+    (set-up-packages)
+    (package-name #\A))
   "A")
 
 (deftest package-name.3
-  (let () (ignore-errors (package-name "Q")))
+  (progn
+    (set-up-packages)
+    (package-name "Q"))
   "A")
 
 (deftest package-name.4
-  (let () (ignore-errors (package-name #\Q)))
+  (progn
+    (set-up-packages)
+    (package-name #\Q))
   "A")
 
 (deftest package-name.5
@@ -101,7 +109,7 @@
   (loop
    for p in (list-all-packages) count
    (not (equal (package-name p)
-	       (ignore-errors (package-name (package-name p))))))
+	       (package-name (package-name p)))))
   0)
 
 ;;; Specialized sequence tests
diff --git a/ansi-tests/package-nicknames.lsp b/ansi-tests/package-nicknames.lsp
index c5e0395f519e4e3ca823f0e1827a59efe3dae7d2..872b182c7d922eeadb3e0b57e0a0546fe7a8e3d4 100644
--- a/ansi-tests/package-nicknames.lsp
+++ b/ansi-tests/package-nicknames.lsp
@@ -10,44 +10,52 @@
 ;;; package-nicknames
 
 (deftest package-nicknames.1
-  (let () (ignore-errors (package-nicknames "A")))
+  (progn
+    (set-up-packages)
+    (package-nicknames "A"))
   ("Q"))
 
 (deftest package-nicknames.2
-  (let () (ignore-errors (package-nicknames #\A)))
+  (progn
+    (set-up-packages)
+    (package-nicknames #\A))
   ("Q"))
 
 (deftest package-nicknames.3
-  (let () (ignore-errors (package-nicknames ':|A|)))
+  (progn
+    (set-up-packages)
+    (package-nicknames ':|A|))
   ("Q"))
 
 (deftest package-nicknames.4
-  (let () (ignore-errors (package-nicknames "B")))
+  (progn
+    (set-up-packages)
+    (package-nicknames "B"))
   nil)
 
 (deftest package-nicknames.5
-  (let () (ignore-errors (package-nicknames #\B)))
+  (progn
+    (set-up-packages)
+    (package-nicknames #\B))
   nil)
 
 (deftest package-nicknames.6
-  (let () (ignore-errors (package-nicknames '#:|B|)))
+  (progn
+    (set-up-packages)
+    (package-nicknames '#:|B|))
   nil)
 
 (deftest package-nicknames.7
-  (let ()
-    (ignore-errors
-      (subsetp '(#.(string '#:cl))
-	       (package-nicknames "COMMON-LISP")
-	       :test #'string=)))
+  (subsetp '(#.(string '#:cl))
+	   (package-nicknames "COMMON-LISP")
+	   :test #'string=)
   t)
 
 (deftest package-nicknames.8
-  (let ()
-    (ignore-errors
-      (notnot
-       (subsetp '(#.(string '#:cl-user))
-		(package-nicknames "COMMON-LISP-USER")
-		:test #'string=))))
+  (notnot
+   (subsetp '(#.(string '#:cl-user))
+	    (package-nicknames "COMMON-LISP-USER")
+	    :test #'string=))
   t)
 
 (deftest package-nicknames.9
@@ -59,7 +67,9 @@
   t)
 
 (deftest package-nicknames.10
-  (let () (ignore-errors (package-nicknames (find-package "A"))))
+  (progn
+    (set-up-packages)
+    (package-nicknames (find-package "A")))
   ("Q"))
 
 (deftest package-nicknames.11
diff --git a/ansi-tests/with-package-iterator.lsp b/ansi-tests/with-package-iterator.lsp
index b288941ef17156b81c44c97cbc33ffcdd383ed99..a0b1b42527c782fae8d13ee9166b9b6dc5aeab63 100644
--- a/ansi-tests/with-package-iterator.lsp
+++ b/ansi-tests/with-package-iterator.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 (declaim (optimize (safety 3)))
 
-(compile-and-load "package-aux.lsp")
+(load "package-aux.lsp")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; with-package-iterator
@@ -31,27 +31,39 @@
 ;;; multiple inheritance
 
 (deftest with-package-iterator.5
-  (with-package-iterator-all '("A"))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-all '("A")))
   t)
 
 (deftest with-package-iterator.6
-  (with-package-iterator-all '(#:|A|))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-all '(#:|A|)))
   t)
 
 (deftest with-package-iterator.7
-  (with-package-iterator-all '(#\A))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-all '(#\A)))
   t)
 
 (deftest with-package-iterator.8
-  (with-package-iterator-internal (list (find-package "A")))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-internal (list (find-package "A"))))
   t)
 
 (deftest with-package-iterator.9
-  (with-package-iterator-external (list (find-package "A")))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-external (list (find-package "A"))))
   t)
 
 (deftest with-package-iterator.10
-  (with-package-iterator-inherited (list (find-package "A")))
+  (progn
+    (set-up-packages)
+    (with-package-iterator-inherited (list (find-package "A"))))
   t)
 
 (deftest with-package-iterator.11