diff --git a/ansi-tests/char-aux.lsp b/ansi-tests/char-aux.lsp
index 7db20e1195ef612c24c73254b9259673c57ceed6..61d6d42f07d5ff4ea0ae837fc88647bf697d2c8b 100644
--- a/ansi-tests/char-aux.lsp
+++ b/ansi-tests/char-aux.lsp
@@ -272,6 +272,7 @@
      t)))
 
 (defun name-char.1.body ()
+  (declare (optimize (safety 3)))
   (loop for x in *universe*
 	for s = (catch-type-error (string x))
 	always
@@ -279,4 +280,7 @@
 	    (let ((c (name-char x)))
 	      (or (not c)
 		  (characterp c)
-		  (string-equal (char-name c) s))))))
\ No newline at end of file
+		  (let ((name (char-name c)))
+		    (declare (type (or null string) name))
+		    (and name
+			 (string-equal name s))))))))
diff --git a/ansi-tests/gclload2.lsp b/ansi-tests/gclload2.lsp
index 70bf291c05b5f60c780a8e04f5b99590418ecabc..0f43faeb67e629942b16675983d54b67432cbe42 100644
--- a/ansi-tests/gclload2.lsp
+++ b/ansi-tests/gclload2.lsp
@@ -196,7 +196,7 @@
 
 ;;; Tests of packages
 
-(load "packages.lsp")
+#-ecl (load "packages.lsp")
 
 ;;; Tests of sequences
 
@@ -245,7 +245,7 @@
 (load "structure-00.lsp")
 (load "structures-01.lsp")
 (load "structures-02.lsp")
-(load "structures-03.lsp")
+#-ecl (load "structures-03.lsp")
 
 ;;; Tests of types and classes
 
diff --git a/ansi-tests/makefile b/ansi-tests/makefile
index 63384d87ddc23333cfece942a54f8a6c05a4311b..2b72aac98f80c3a7d2c2f291abace7d41fb15fff 100644
--- a/ansi-tests/makefile
+++ b/ansi-tests/makefile
@@ -6,4 +6,4 @@ test-unixport:
 	echo "(load \"gclload.lsp\")" | ../unixport/saved_ansi_gcl | tee test.out
 
 clean:
-	rm -f test.out *.fasl *.o *~ *.fn *.x86f *.fasl rt/*.o rt/*.fasl rt/*.fn rt/*~ rt/*.x86f rt/*.fasl
+	rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl
diff --git a/ansi-tests/packages-00.lsp b/ansi-tests/packages-00.lsp
index 6783c6a204b6f9c7bf5c81ded27996fa85929b1d..0f951e3c610274a7c465a0f23637a8d704e52a26 100644
--- a/ansi-tests/packages-00.lsp
+++ b/ansi-tests/packages-00.lsp
@@ -36,4 +36,4 @@
   (:shadowing-import-from "DS1" "B")
   (:use "DS1" "DS3")
   (:intern "X" "Y" "Z")
-  (:import-from "DS2" "F"))9
+  (:import-from "DS2" "F"))
diff --git a/ansi-tests/packages.lsp b/ansi-tests/packages.lsp
index 3056810eb858563f5a6c68eeef2c8ed9c8aecac3..dc6b38ea275308c72a80f9b6d7da1fd5e83be598 100644
--- a/ansi-tests/packages.lsp
+++ b/ansi-tests/packages.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Loader for files containing package tests
 
 
-(compile-and-load "packages-00.lsp")
+(load "packages-00.lsp")
 (load "packages-01.lsp")
 (load "packages-02.lsp")
 (load "packages-03.lsp")