diff --git a/ansi-tests/compileit.lsp b/ansi-tests/compileit.lsp
index 17dc477ce581b50a34cc5dbd707c4df96e32bf20..167cbbed8066444f2f69e0886f79e5c61455eacf 100644
--- a/ansi-tests/compileit.lsp
+++ b/ansi-tests/compileit.lsp
@@ -5,7 +5,7 @@
 ;; (pushnew :ansi-tests-strict-initial-element *features*)
 
 #+allegro (run-shell-command "rm -f *.fasl")
-#+cmucl (run-program "rm -f *.x86f")
+#+cmu (run-program "rm -f *.x86f")
 
 (load "gclload1.lsp")
 (load "gclload2.lsp")
@@ -24,4 +24,4 @@
 (time (regression-test:do-tests))
 
 #+allegro :exit
-#+(or cmucl sbcl gcl) (quit)
+#+(or cmu sbcl gcl) (quit)
diff --git a/ansi-tests/doit.lsp b/ansi-tests/doit.lsp
index 2b38997b2e318dc1e8c20d9da3bfc73303fa3cd9..62db62e74b48ad946de25e8724303941a5dbc3ff 100644
--- a/ansi-tests/doit.lsp
+++ b/ansi-tests/doit.lsp
@@ -6,7 +6,7 @@
 
 #+allegro (run-shell-command "rm -f *.fasl")
 #+allegro (setq *enclose-printer-errors* nil)
-#+cmucl (run-program "rm -f *.x86f")
+#+cmu (run-program "rm -f *.x86f")
 
 (load "gclload1.lsp")
 (load "gclload2.lsp")
@@ -20,7 +20,13 @@
   (rt:disable-note :assume-no-gray-streams))
 
 (in-package :cl-test)
+
+;;; These two tests will misbehave if the tests are being
+;;; invoked from a file that is being loaded, so remove them
+(when *load-pathname*
+  (mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1)))
+
 (time (regression-test:do-tests))
 
 #+allegro (cl-user::exit)
-#+(or cmucl sbcl gcl armedbear) (cl-user::quit)
+#+(or cmu sbcl gcl armedbear) (cl-user::quit)