diff --git a/alexandria-1/tests.lisp b/alexandria-1/tests.lisp
index dc3d9218f341c8036867289895f4ced6b9fadda4..6b394757f9847268fb4d93fe4f9310c95b9e6f0e 100644
--- a/alexandria-1/tests.lisp
+++ b/alexandria-1/tests.lisp
@@ -1,11 +1,11 @@
 (in-package :cl-user)
 
-(defpackage :alexandria-tests
+(defpackage :alexandria/tests
   (:use :cl :alexandria #+sbcl :sb-rt #-sbcl :rtest)
   (:import-from #+sbcl :sb-rt #-sbcl :rtest
                 #:*compile-tests* #:*expected-failures*))
 
-(in-package :alexandria-tests)
+(in-package :alexandria/tests)
 
 (defun run-tests (&key ((:compiled *compile-tests*)))
   (do-tests))
diff --git a/alexandria-2/tests.lisp b/alexandria-2/tests.lisp
index 7da93a7cf100b510fcbad2ee1e81c9a95ed66bf9..531a2cd50fc8c7e3dc725436765c4df965767aff 100644
--- a/alexandria-2/tests.lisp
+++ b/alexandria-2/tests.lisp
@@ -1,11 +1,11 @@
 (in-package :cl-user)
 
-(defpackage :alexandria2-tests
+(defpackage :alexandria-2/tests
   (:use :cl :alexandria-2 #+sbcl :sb-rt #-sbcl :rtest)
   (:import-from #+sbcl :sb-rt #-sbcl :rtest
                 #:*compile-tests* #:*expected-failures*))
 
-(in-package :alexandria2-tests)
+(in-package :alexandria-2/tests)
 
 ;; Arrays Tests
 (deftest dim-in-bounds-p.0
diff --git a/alexandria-tests.asd b/alexandria-tests.asd
deleted file mode 100644
index c21142493cc26e2089b6980640bc4721780e9be3..0000000000000000000000000000000000000000
--- a/alexandria-tests.asd
+++ /dev/null
@@ -1,16 +0,0 @@
-(defsystem "alexandria-tests"
-  :licence "Public Domain / 0-clause MIT"
-  :description "Tests for Alexandria, which is a collection of portable public domain utilities."
-  :author "Nikodemus Siivola <nikodemus@sb-studio.net>, and others."
-  :depends-on (:alexandria #+sbcl :sb-rt #-sbcl :rt)
-  :components ((:file "alexandria-1/tests")
-               (:file "alexandria-2/tests"))
-  :perform (test-op (o c)
-             (let ((unexpected-failure-p nil))
-               (flet ((run-tests (&rest args)
-                        (unless (apply (intern (string '#:run-tests) '#:alexandria-tests) args)
-                          (setf unexpected-failure-p t))))
-                 (run-tests :compiled nil)
-                 (run-tests :compiled t))
-               (when unexpected-failure-p
-                 (error "Unexpected test failure")))))
diff --git a/alexandria.asd b/alexandria.asd
index ea543dae60e3c01c9c98ccb35690b71b2335c21d..466d3734d5a0c9ffa5f9a4080f3f58aa379bbd7e 100644
--- a/alexandria.asd
+++ b/alexandria.asd
@@ -67,4 +67,21 @@ the following constraints:
                          (:file "control-flow" :depends-on ("package"))
                          (:file "sequences" :depends-on ("package"))
                          (:file "lists" :depends-on ("package")))))
-  :in-order-to ((test-op (test-op "alexandria-tests"))))
+  :in-order-to ((test-op (test-op "alexandria/tests"))))
+
+(defsystem "alexandria/tests"
+  :licence "Public Domain / 0-clause MIT"
+  :description "Tests for Alexandria, which is a collection of portable public domain utilities."
+  :author "Nikodemus Siivola <nikodemus@sb-studio.net>, and others."
+  :depends-on (:alexandria #+sbcl :sb-rt #-sbcl :rt)
+  :components ((:file "alexandria-1/tests")
+               (:file "alexandria-2/tests"))
+  :perform (test-op (o c)
+                    (let ((unexpected-failure-p nil))
+                      (flet ((run-tests (&rest args)
+                               (unless (apply (intern (string '#:run-tests) '#:alexandria/tests) args)
+                                 (setf unexpected-failure-p t))))
+                        (run-tests :compiled nil)
+                        (run-tests :compiled t))
+                      (when unexpected-failure-p
+                        (error "Unexpected test failure")))))
diff --git a/scripts/ci-test.lisp b/scripts/ci-test.lisp
index 7dd38003ecc69fa90c7c8042757ac9c867472fbb..2d74959801c1d1998d770ebc71f877f824f4fc8a 100644
--- a/scripts/ci-test.lisp
+++ b/scripts/ci-test.lisp
@@ -1,5 +1,5 @@
 ;; Install all the deps
-(ql:quickload "alexandria-tests")
+(ql:quickload "alexandria/tests")
 
 ;; Run the tests!
 (asdf:test-system "alexandria")