diff --git a/Makefile b/Makefile
index a336fa1e548cf3aa48933d817cf146029f00e72b..b989fd66e259b7c0f3dd05a54bfa11009f045f02 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ endif
 ## MINOR FAIL: xcl (logical pathname issue in asdf-pathname-test.script)
 ## OCCASIONALLY TESTED BY NOT ME: allegromodern (not in my free demo version)
 ## OCCASIONALLY TESTED BY NOT ME: lispworks (testing requires Pro version)
-## MAJOR FAIL: gclcvs -- COMPILER BUG! Upstream fixed it, but it won't compile for me.
+## MAJOR FAIL: gclcvs -- COMPILER BUG! Upstream fixed it, but upstream fails to compile.
 ## NOT SUPPORTED BY OUR TESTS: cormancl genera rmcl. Manually tested once in a while.
 
 lisp ?= sbcl
diff --git a/asdf.asd b/asdf.asd
index 3890063e4cb53c429eb4dfa19ab140c8e577c047..7eed2f037fd4d3efe715d32ca4d33d90ba062361 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -14,7 +14,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.20.8" ;; to be automatically updated by bin/bump-revision
+  :version "2.20.9" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components
   ((:file "asdf")
diff --git a/asdf.lisp b/asdf.lisp
index 7ae9c413481416a3ce571dacf74ad0e16a25ae97..8e44c1d2d26a933b3ca64c91dd7886d122bce8d2 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.20.8: Another System Definition Facility.
+;;; This is ASDF 2.20.9: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
@@ -115,7 +115,7 @@
          ;; "2.345.6" would be a development version in the official upstream
          ;; "2.345.0.7" would be your seventh local modification of official release 2.345
          ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.20.8")
+         (asdf-version "2.20.9")
          (existing-asdf (find-class 'component nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
@@ -340,6 +340,7 @@
             #:ensure-source-registry
             #:process-source-registry
             #:system-registered-p
+            #:resolve-location
             #:asdf-message
             #:user-output-translations-pathname
             #:system-output-translations-pathname
@@ -354,13 +355,16 @@
             #:absolute-pathname-p
             ;; #:aif #:it
             ;; #:appendf #:orf
+            ;; #:first-char #:last-char
             #:coerce-name
             #:directory-pathname-p
-            ;; #:ends-with
+            #:pathname-root
+            #:ends-with
             #:ensure-directory-pathname
             #:getenv
+            #:probe-file*
             ;; #:length=n-p
-            ;; #:find-symbol*
+            #:find-symbol*
             #:merge-pathnames* #:coerce-pathname #:subpathname
             #:pathname-directory-pathname
             #:read-file-forms
@@ -1703,7 +1707,8 @@ Going forward, we recommend new users should be using the source-registry.
                                   :condition condition))))
              (let ((*package* package)
                    (*default-pathname-defaults*
-                    (pathname-directory-pathname pathname)))
+                    ;; resolve logical-pathnames so they won't wreak havoc in parsing namestrings.
+                    (translate-logical-pathname (pathname-directory-pathname pathname))))
                (asdf-message (compatfmt "~&~@<; ~@;Loading system definition from ~A into ~A~@:>~%")
                              pathname package)
                (load pathname)))
diff --git a/test/compile-asdf.lisp b/test/compile-asdf.lisp
index 437db7fd7db4fab67561cd03014417ee92044e0f..127aeb22e18e6d266c23078ceee369158d7df7b7 100644
--- a/test/compile-asdf.lisp
+++ b/test/compile-asdf.lisp
@@ -1,11 +1,14 @@
 (in-package #:common-lisp-user)
 
+(load (make-pathname :name "script-support" :defaults *load-pathname*))
+
+(in-package #:asdf-test)
+
 (declaim (optimize (speed 2) (safety 3) #-allegro (debug 3)
 		   #+(or cmu scl) (c::brevity 2)))
 (proclaim '(optimize (speed 2) (safety 3) #-allegro (debug 3)
 		     #+(or cmu scl) (c::brevity 2)))
 
-(load (make-pathname :name "script-support" :defaults *load-pathname*))
 (defun my-compile-file (&rest args) (apply 'compile-file args))
 #+ecl (trace my-compile-file)
 
diff --git a/test/script-support.lisp b/test/script-support.lisp
index 7accdd99a9fc428cde3badcaea687421c4e51fae..588c561f1ee777634fccf4c20468e2f9ee4ccfb6 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -1,4 +1,6 @@
-(in-package #:common-lisp-user)
+(defpackage :asdf-test (:use :common-lisp))
+
+(in-package #:asdf-test)
 
 (declaim (optimize (speed 2) (safety 3) #-allegro (debug 3)))
 (proclaim '(optimize (speed 2) (safety 3) #-allegro (debug 3)))
@@ -39,12 +41,16 @@
       *asdf-lisp*))))
 
 (defun load-asdf ()
-  (load *asdf-fasl*))
+  (load *asdf-fasl*)
+  (use-package :asdf :asdf-test)
+  (setf *package* (find-package :asdf-test)))
+
+(defun common-lisp-user::load-asdf ()
+  (load-asdf))
 
 #+allegro
 (setf excl:*warn-on-nested-reader-conditionals* nil)
 
-#-sbcl
 (defun native-namestring (x)
   (let ((p (pathname x)))
     #+clozure (ccl:native-translated-namestring p)
@@ -95,11 +101,14 @@ is bound, write a message and exit on an error.  If
                   ((ignore-errors (funcall (find-symbol "GETENV" :asdf) "DEBUG_ASDF_TEST"))
                    (break))
                   (t
+                   (finish-output *standard-output*)
+                   (finish-output *trace-output*)
                    (format *error-output* "~&ABORTING:~% ~S~%" c)
                    #+sbcl (sb-debug:backtrace 69)
                    #+clozure (ccl:print-call-history :count 69 :start-frame-number 1)
                    #+clisp (system::print-backtrace)
                    (format *error-output* "~&ABORTING:~% ~S~%" c)
+                   (finish-output *error-output*)
                    (leave-lisp "~&Script failed~%" 1))))))
     (funcall thunk)
     (leave-lisp "~&Script succeeded~%" 0)))
diff --git a/test/test-around-compile.script b/test/test-around-compile.script
index 72c0dd103391a5c769f04fb7875972e6619ac07e..fca36f1e203a588ca02085790c77d70874b621e8 100644
--- a/test/test-around-compile.script
+++ b/test/test-around-compile.script
@@ -3,6 +3,6 @@
 (load-asdf)
 
 (quit-on-error
-  (setf asdf:*central-registry* '(*default-pathname-defaults*))
-  (asdf:load-system 'test-around-compile :force t)
-  (assert (= 3 (cl-user::add10 1)))) ;; add10 must have been compiled in base 2
+  (setf *central-registry* '(*default-pathname-defaults*))
+  (load-system 'test-around-compile :force t)
+  (assert (= 3 (add10 1)))) ;; add10 must have been compiled in base 2
diff --git a/test/test-configuration.script b/test/test-configuration.script
index 374ec558452e4616ab48f2e580175609a4c9966a..21a8c032d91c04d583aedc7dd285db8544a8232e 100644
--- a/test/test-configuration.script
+++ b/test/test-configuration.script
@@ -1,10 +1,9 @@
 ;;; -*- Lisp -*-
 (load "script-support.lisp")
 (load-asdf)
-(in-package :asdf)
 
 (defparameter *test-directory*
-  (merge-pathnames* (coerce-pathname "tmp/") cl-user::*asdf-directory*))
+  (merge-pathnames* (coerce-pathname "tmp/") *asdf-directory*))
 
 (defun under-test-directory (designator &optional (defaults *test-directory*))
   (namestring (merge-pathnames* (coerce-pathname designator) defaults)))
@@ -58,28 +57,28 @@
                        :direction :output
                        :if-exists :rename-and-delete
                        :if-does-not-exist :create)
-      (format s "(asdf:defsystem :foo~D)~%" i))))
+      (format s "(defsystem :foo~D)~%" i))))
 
-(cl-user::quit-on-error
+(quit-on-error
 
 (assert
- (equal (parse-output-translations-string "/foo:/bar::/baz:/quux")
+ (equal (asdf::parse-output-translations-string "/foo:/bar::/baz:/quux")
         '(:output-translations
           ("/foo" "/bar")
           :inherit-configuration
           ("/baz" "/quux"))))
 (assert
- (equal (parse-output-translations-string "/:")
+ (equal (asdf::parse-output-translations-string "/:")
         '(:output-translations ("/" nil) :ignore-inherited-configuration)))
 (assert
- (equal (parse-output-translations-string "/::")
+ (equal (asdf::parse-output-translations-string "/::")
         '(:output-translations ("/" nil) :inherit-configuration)))
 (assert
- (equal (parse-output-translations-string "/:/")
+ (equal (asdf::parse-output-translations-string "/:/")
         '(:output-translations ("/" "/") :ignore-inherited-configuration)))
 
 (assert
- (equal (parse-output-translations-string
+ (equal (asdf::parse-output-translations-string
          "(:output-translations (\"/\" \"/\") :ignore-inherited-configuration)")
         '(:output-translations ("/" "/") :ignore-inherited-configuration)))
 
diff --git a/test/test-force.asd b/test/test-force.asd
index 07d12b0c72bb4acd4c89c3b34569b979c7e74a06..2d8b3ff9dba7f6f0048a377680d6603364bcbd9d 100644
--- a/test/test-force.asd
+++ b/test/test-force.asd
@@ -2,4 +2,3 @@
 (asdf:defsystem test-force
   :components
   ((:file "file1")))
-
diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script
new file mode 100644
index 0000000000000000000000000000000000000000..d905f61786b0d82237c0d1f763c24bd5c06be64e
--- /dev/null
+++ b/test/test-logical-pathname.script
@@ -0,0 +1,36 @@
+;;; -*- Lisp -*-
+(load "script-support.lisp")
+(load-asdf)
+
+(setf (logical-pathname-translations "ASDF")
+      `(("**;*.asd.*" ,(make-pathname :type "asd" :defaults (resolve-location `(,*asdf-directory* :**/ :*.*.*))))
+        ("**;*.asd" ,(resolve-location `(,*asdf-directory* :**/ #p"*.asd")))
+        ("**;*.lisp.*" ,(make-pathname :type "lisp" :defaults (resolve-location `(,*asdf-directory* :**/ :*.*.*))))
+        ("**;*.lisp" ,(resolve-location `(,*asdf-directory* :**/ #p"*.lisp")))
+        ("**;*.*.*" ,(resolve-location
+                      `(,*asdf-directory* "tmp/fasls" :implementation "logical-host-asdf" :**/ :*.*.*)))))
+
+(quit-on-error
+ (format t "~S~%" (translate-logical-pathname "ASDF:test;test-force.asd"))
+ (format t "~S~%" (truename "ASDF:test;test-force.asd"))
+
+ (format t "Test logical pathnames in central registry~%")
+ (setf *central-registry* '("ASDF:test;"))
+ (initialize-source-registry '(:source-registry :ignore-inherited-configuration))
+ (load-system :test-force :force t)
+
+ (format t "Test logical pathnames in source-registry, non-recursive~%")
+ (clear-system :test-force)
+ (setf *central-registry* '())
+ (initialize-source-registry
+  '(:source-registry (:directory "ASDF:test;") :ignore-inherited-configuration))
+ (load-system :test-force :force t)
+
+ (format t "Test logical pathnames in source-registry, recursive~%")
+ (clear-system :test-force)
+ (setf *central-registry* '())
+ (initialize-source-registry
+  '(:source-registry (:tree "ASDF:") :ignore-inherited-configuration))
+ (load-system :test-force :force t)
+
+ (format t "Done~%"))
diff --git a/test/test-multiple.script b/test/test-multiple.script
index 62f9f7c19c738c959804883952bc491b65792641..b28cae2057212fe10437252b21a20c89fe90612d 100644
--- a/test/test-multiple.script
+++ b/test/test-multiple.script
@@ -3,19 +3,19 @@
 (load-asdf)
 
 (quit-on-error
- (let* ((asd (asdf:merge-pathnames* (asdf:coerce-pathname "test-multiple.asd")
-                                    *test-directory*))
-        (tmp (asdf:merge-pathnames* (asdf:coerce-pathname "../tmp/")
-                                    *test-directory*))
-        (asd2 (asdf:merge-pathnames* (asdf:coerce-pathname "test-multiple-too.asd")
+ (let* ((asd (merge-pathnames* (coerce-pathname "test-multiple.asd")
+                               *test-directory*))
+        (tmp (merge-pathnames* (coerce-pathname "../tmp/")
+                               *test-directory*))
+        (asd2 (merge-pathnames* (coerce-pathname "test-multiple-too.asd")
                                      tmp))
-        (file4 (asdf:compile-file-pathname* "file4")))
-   (setf asdf:*central-registry* `(*default-pathname-defaults* ,tmp))
-   (assert (= 0 (asdf:run-shell-command
+        (file4 (compile-file-pathname* "file4")))
+   (setf *central-registry* `(*default-pathname-defaults* ,tmp))
+   (assert (= 0 (run-shell-command
                  (format nil "/bin/ln -sf ~A ~A"
-                         (cl-user::native-namestring asd)
-                         (cl-user::native-namestring asd2)))))
-   (asdf:oos 'asdf:load-source-op 'test-multiple-too)
+                         (native-namestring asd)
+                         (native-namestring asd2)))))
+   (oos 'load-source-op 'test-multiple-too)
    (assert (symbol-value (find-symbol (string :*file3*) :test-package)))
-   (asdf:load-system 'test-multiple-free)
+   (load-system 'test-multiple-free)
    (assert (asdf::probe-file* file4))))
diff --git a/test/test-nested-1.lisp b/test/test-nested-1.lisp
index b9b4dc5e2e9b2f09e669d14ece9469cb8f311e11..bcee43e8834ed542b89e211153a7c771cf5d8bd0 100644
--- a/test/test-nested-1.lisp
+++ b/test/test-nested-1.lisp
@@ -1 +1 @@
-(in-package #:common-lisp-user)
\ No newline at end of file
+(in-package #:asdf-test)
diff --git a/test/test-nested-components-1.asd b/test/test-nested-components-1.asd
index 5e8b6af5921e1ec76d3c4a3a76551750afa2cd23..cb27c953f54d063455126dced118ab3b6a309275 100644
--- a/test/test-nested-components-1.asd
+++ b/test/test-nested-components-1.asd
@@ -1,25 +1,5 @@
 ;;; -*- Mode: common-lisp; Syntax: Common-Lisp; -*-
 
-;; copyright (c) 2006-2007 Franz Inc, Oakland, CA - All rights reserved.
-;;
-;; The software, data and information contained herein are proprietary
-;; to, and comprise valuable trade secrets of, Franz, Inc.  They are
-;; given in confidence by Franz, Inc. pursuant to a written license
-;; agreement, and may be stored and used only in accordance with the terms
-;; of such license.
-;;
-;; Restricted Rights Legend
-;; ------------------------
-;; Use, duplication, and disclosure of the software, data and information
-;; contained herein by any agency, department or entity of the U.S.
-;; Government are subject to restrictions of Restricted Rights for
-;; Commercial Software developed at private expense as specified in
-;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
-;;
-;; $Id: db-agraph-preflight.asd,v 1.1.2.1 2009/01/16 23:58:53 gwking Exp $
-
-;; -*- mode: common-lisp -*-
-
 (in-package #:common-lisp-user)
 
 (defpackage #:test-nested-components.system
diff --git a/test/test-nested-components.script b/test/test-nested-components.script
index 67976903d896250bd6c542c5d199ce44d30102a0..c1baa50c02f41052f066e27255b5911f4bfd58c0 100644
--- a/test/test-nested-components.script
+++ b/test/test-nested-components.script
@@ -4,7 +4,6 @@
 
 (load "script-support.lisp")
 (load-asdf)
-(in-package #:common-lisp-user)
 
 (quit-on-error
  (setf asdf:*central-registry* nil)
diff --git a/test/test-package.script b/test/test-package.script
index 0e9c55e0d6da67d0e43fc13a41d0b1766d48d170..33d693886475c0c25de274cbba4d3b11a7450fd1 100644
--- a/test/test-package.script
+++ b/test/test-package.script
@@ -1,8 +1,8 @@
 ;;; -*- Lisp -*-
-(in-package :cl-user)
 (load "script-support.lisp")
 (load-asdf)
-(quit-on-error 
+(in-package :cl-user)
+(asdf-test::quit-on-error
  (defun module () 1)
  (load "test-package.asd")
  (defclass module () ())
diff --git a/test/test-static-and-serial.script b/test/test-static-and-serial.script
index 27d6e9fe7ae35ef25b0e8204339148c403feacbc..b8905be807dee270e300e56382bd94f3608e0783 100644
--- a/test/test-static-and-serial.script
+++ b/test/test-static-and-serial.script
@@ -2,12 +2,10 @@
 (load "script-support.lisp")
 (load-asdf)
 
-(in-package :asdf)
+#+gcl (trace coerce-pathname)
 
-(trace #+gcl coerce-pathname)
-
-(cl-user::quit-on-error
- (format t "dpd: ~S~%f1: ~S~%" *default-pathname-defaults* (asdf:merge-pathnames* "file1"))
+(quit-on-error
+ (format t "dpd: ~S~%f1: ~S~%" *default-pathname-defaults* (merge-pathnames* "file1"))
 
  (setf *central-registry* '(*default-pathname-defaults*))
 
diff --git a/test/test-try-recompiling-1.script b/test/test-try-recompiling-1.script
index 5a509c9fde7bc2d87dcccdb93b0419585b907d55..79efdc2d750e8683f2647d21f021cbab0f6c4142 100644
--- a/test/test-try-recompiling-1.script
+++ b/test/test-try-recompiling-1.script
@@ -7,10 +7,10 @@
 (defvar *caught-error* nil)
 
 (quit-on-error
- (asdf:run-shell-command "rm -f ~A"
-                         (namestring
-                          (compile-file-pathname "try-recompiling-1")))
- (setf asdf:*central-registry* '(*default-pathname-defaults*))
+ (run-shell-command "rm -f ~A"
+                    (namestring
+                     (compile-file-pathname "try-recompiling-1")))
+ (setf *central-registry* '(*default-pathname-defaults*))
  #-gcl
  (handler-bind ((error (lambda (c)
                          (setf *caught-error* t)
@@ -25,7 +25,5 @@
                              (print (list c restart (compute-restarts c)))
                              (when restart
                                (invoke-restart restart)))))))
-   (asdf:oos 'asdf:load-op 'try-recompiling-1))
- (assert *caught-error*)
- )
-
+   (oos 'load-op 'try-recompiling-1))
+ (assert *caught-error*))
diff --git a/test/test-utilities.script b/test/test-utilities.script
index b4ebe3cbac38f2ac146fa4b553ff386910be10f4..2153d1484cdd24d789e470a491d76ca049cbc1f9 100644
--- a/test/test-utilities.script
+++ b/test/test-utilities.script
@@ -1,8 +1,8 @@
 ;;; -*- Lisp -*-
 (load "script-support.lisp")
 (load-asdf)
-(in-package :asdf)
-(cl-user::quit-on-error
+
+(quit-on-error
 
 (assert
  (every #'directory-pathname-p
@@ -37,14 +37,14 @@
 (assert (equal (multiple-value-list (component-name-to-pathname-components "/aa/ba" :force-directory nil))
                '(:absolute ("aa") "ba")))
 (assert
- (asdf::version-satisfies (asdf:asdf-version) (asdf:asdf-version)))
+ (version-satisfies (asdf-version) (asdf-version)))
 (assert
- (asdf::version-satisfies (asdf:asdf-version) "2.000"))
+ (version-satisfies (asdf-version) "2.000"))
 (assert
- (not (asdf::version-satisfies (asdf:asdf-version) "666")))
+ (not (version-satisfies (asdf-version) "666")))
 (assert
   (equal (asdf::split-absolute-pathnames "/foo:/bar" "baz") '("/foo" "/bar")))
-(assert (equal (mapcar 'location-function-p
+(assert (equal (mapcar 'asdf::location-function-p
                        '((:function f)
                          (:function (lambda (path absolute-source)
                                       (declare (ignore absolute-source))
diff --git a/test/test-version.script b/test/test-version.script
index c0b8216c9cb6b61e9085b0ccf6b5ee46372550fb..57b81d7209cbe75a994102a8ecb634fab4e0183c 100644
--- a/test/test-version.script
+++ b/test/test-version.script
@@ -1,14 +1,10 @@
 ;;; -*- Lisp -*-
 (load "script-support.lisp")
 (load-asdf)
-(setf asdf:*central-registry* '(*default-pathname-defaults*))
 
-(defpackage :test-version-system
-  (:use :cl :asdf))
+(setf *central-registry* '(*default-pathname-defaults*))
 
-(in-package :test-version-system)
-
-(cl-user::quit-on-error
+(quit-on-error
  (defsystem :versioned-system-1
    :pathname #.*default-pathname-defaults*
    :version "1.0")
@@ -22,10 +18,8 @@
    :version "1.2")
 
  (flet ((test (name v &optional (true t))
-          (or (eq true (asdf::version-satisfies (find-system name) v))
+          (or (eq true (version-satisfies (find-system name) v))
               (error "no satisfaction: ~S version ~A not ~A" name v true))))
    (test :versioned-system-1 "1.0")
    (test :versioned-system-2 "1.0")
-   (test :versioned-system-3 "2.0" nil))
-
- )
\ No newline at end of file
+   (test :versioned-system-3 "2.0" nil)))
diff --git a/test/test.lisp b/test/test.lisp
index 54d513487f4df55638b9ded323a8558e1374bfc3..f5becb1df10fa11de484e5a892c7d4b49ba50c8b 100644
--- a/test/test.lisp
+++ b/test/test.lisp
@@ -1,5 +1,5 @@
 ;;;; Example lisp code.
-(in-package :cl-user)
+(in-package :asdf-test)
 
 (defun tst (x)
   (1+ x))
diff --git a/test/test1.preferences b/test/test1.preferences
index b18f816cc171d8b722f75fbaadf703eb019914ed..d2d1bca648fe0f3d1ad6b20eda7a1379e5ff3eac 100644
--- a/test/test1.preferences
+++ b/test/test1.preferences
@@ -1,3 +1,3 @@
-(in-package #:common-lisp-user)
+(in-package #:asdf-test)
 
 (setf *test6* :yes)
diff --git a/test/test3.script b/test/test3.script
index da88feaa887e51c44038bbba48c2c13a76d956c3..9138b7d36e758c85e4bed34ce606029fc042f28c 100644
--- a/test/test3.script
+++ b/test/test3.script
@@ -2,12 +2,12 @@
 #+(or f1 f2) (error "This test cannot run if :f1 or :f2 are on *features*")
 (load "script-support.lisp")
 (load-asdf)
-(in-package :asdf)
-(cl-user::quit-on-error
+
+(quit-on-error
  (let* ((fasl1 (asdf:compile-file-pathname* (truename "file1.lisp")))
         (fasl2 (asdf:compile-file-pathname* (truename "file2.lisp")))
-        (ns1 (cl-user::native-namestring fasl1))
-        (ns2 (cl-user::native-namestring fasl2)))
+        (ns1 (native-namestring fasl1))
+        (ns2 (native-namestring fasl2)))
      (asdf:run-shell-command "rm -f ~A ~A" ns1 ns2)
      (setf asdf:*central-registry* '(*default-pathname-defaults*))
      #-gcl
diff --git a/test/test4.script b/test/test4.script
index 559b203fff61a77dbb8f616d79e02f6ac46d11e4..9d5c7efe74a4696680c19d37808781ec85cc4e1d 100644
--- a/test/test4.script
+++ b/test/test4.script
@@ -2,8 +2,8 @@
 ;;; -*- Lisp -*-
 (load "script-support.lisp")
 (load-asdf)
-(in-package :asdf)
-(cl-user::quit-on-error
+
+(quit-on-error
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
  (assert (not (component-property (find-system 'test3) :foo)))
  (assert (equal (component-property (find-system 'test3) :prop1) "value"))
diff --git a/test/test8.script b/test/test8.script
index d16609dc164a8e88cc8641f6317d1ce3148e4d49..537de449298b343b6d559ac85339a4473f50fff4 100644
--- a/test/test8.script
+++ b/test/test8.script
@@ -4,7 +4,7 @@
 
 (load "script-support.lisp")
 (load-asdf)
-(in-package #:common-lisp-user)
+(in-package #:asdf-test)
 
 (quit-on-error
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
diff --git a/test/test9.script b/test/test9.script
index 71f7d36f7ca6a8734a603e7b0e73ee7bf5eb2bf5..32180ca90c84082f3c653ba7c6c58cceda27296f 100644
--- a/test/test9.script
+++ b/test/test9.script
@@ -4,7 +4,6 @@
 
 (load "script-support.lisp")
 (load-asdf)
-(in-package #:common-lisp-user)
 
 (quit-on-error
  (setf asdf:*central-registry* nil)
diff --git a/test/try-recompiling-1.asd b/test/try-recompiling-1.asd
index ed2d2ecfcb83ed04c3fc4ab749451bc9bdcfcd17..e5ffc3f73c9bbcbea94b1ccdc724fadcfdfc4493 100644
--- a/test/try-recompiling-1.asd
+++ b/test/try-recompiling-1.asd
@@ -1,4 +1,3 @@
 ;;; -*- Lisp -*-
-(asdf:defsystem try-recompiling-1
-    :components ((:file "try-recompiling-1")))
-
+(defsystem try-recompiling-1
+  :components ((:file "try-recompiling-1")))
diff --git a/test/try-recompiling-1.lisp b/test/try-recompiling-1.lisp
index 395c719da2530b524c7216a05fdc8b493b85f612..e60bc4fabf3e02debc59e1adef694df741ef7144 100644
--- a/test/try-recompiling-1.lisp
+++ b/test/try-recompiling-1.lisp
@@ -1,4 +1,4 @@
-(in-package #:common-lisp-user)
+(in-package #:asdf-test)
 
 #+clisp (eval-when (:compile-toplevel) (fmakunbound 'try-recompiling-1))
 
diff --git a/test/wild-module.script b/test/wild-module.script
index 41e35efacd96e5a54408f1be60a7fec723f385bc..2e8feb714faec97d86f2b2dfaa4e5fcaa0da9350 100644
--- a/test/wild-module.script
+++ b/test/wild-module.script
@@ -3,5 +3,5 @@
 (load-asdf)
 (quit-on-error
  (load "../wild-modules.lisp")
- (setf asdf:*central-registry* '(*default-pathname-defaults*))
- (asdf:operate 'asdf:load-op 'wild-module))
+ (setf *central-registry* '(*default-pathname-defaults*))
+ (load-system :wild-module))