diff --git a/ritherdon-rest.asd b/ritherdon-rest.asd
index ea34390..20579a5 100644
--- a/ritherdon-rest.asd
+++ b/ritherdon-rest.asd
@@ -7,11 +7,12 @@
   :license  "MIT"
   :version "0.0.1"
   :serial t
-  :in-order-to ((test-op (test-op "ritherdon-rest/tests")))
-  :depends-on (:drakma :cl-json)
+  :depends-on (:drakma
+	       :cl-json)
   :pathname "src/"
   :components ((:file "package")
-               (:file "ritherdon-rest")))
+	       (:file "ritherdon-rest"))
+  :in-order-to ((test-op (test-op :ritherdon-rest/tests))))
 
 ;; The use of '...rest/tests' was because of a warning when trying to
 ;; run the code in SLIME.
@@ -20,11 +21,13 @@
   :author "craig@craigoates.net"
   :license  "MIT"
   :version "0.0.1"
-  :depends-on (:ritherdon-rest :fiveam)
+  :serial t
+  :depends-on (:ritherdon-rest
+	       :fiveam)
+  :pathname "tests/"
+  :components ((:file "package")
+	       (:file "main"))  
   :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")))))
+		    (uiop:symbol-call :ritherdon-rest-tests :test-quasi)))
+
+