diff --git a/ritherdon-rest.asd b/ritherdon-rest.asd
index 94ab138..5fc0d4c 100644
--- a/ritherdon-rest.asd
+++ b/ritherdon-rest.asd
@@ -7,27 +7,24 @@
   :license  "MIT"
   :version "0.0.1"
   :serial t
+  :in-order-to ((test-op (test-op "ritherdon-rest/tests")))
   :pathname "src/"
   :components ((:file "package")
                (:file "ritherdon-rest")))
 
+;; The use of '...rest/tests' was because of a warning when trying to
+;; run the code in SLIME.
 (asdf:defsystem #:ritherdon-rest/tests
   :description "The test suite for the ritherdon-rest project."
   :author "craig@craigoates.net"
   :license  "MIT"
   :version "0.0.1"
   :serial t
-  :depends-on (#:fiveam)
-  :pathname "tests/"
-  :components ((:file "package")
-               (:file "ritherdon-rest-tests")))
-
-(asdf:defsystem #:ritherdon-rest/doc
-  :description "The doc's package for the ritherdon-rest project."
-  :author "craig@craigoates.net"
-  :license  "MIT"
-  :version "0.0.1"
-  :serial t
-  :pathname "doc/"
-  :components ((:file "package")
-               (:file "ritherdon-rest-doc")))
+  :depends-on (:ritherdon-rest :fiveam)
+  :perform (test-op (o s)
+		    (uiop:symbol-call :fiveam :run!
+		    'ritherdon-rest-tests:all-tests))
+  :components ((:module "tests"
+		:serial t
+		:components ((:file "package")
+			     (:file "ritherdon-rest-tests")))))