diff --git a/cl-annot-test.asd b/cl-annot-test.asd
index 67537e4..222ee4f 100644
--- a/cl-annot-test.asd
+++ b/cl-annot-test.asd
@@ -9,4 +9,9 @@
   :depends-on (:cl-test-more :cl-annot)
   :components ((:module "t"
                 :serial t
-                :components ((:file "annot")))))
+                :components ((:file "annot"))))
+  :defsystem-depends-on (:cl-test-more)
+  :perform (test-op :after (op c)
+		    (funcall (intern #.(string :run-test-system) :cl-test-more)
+			     c)
+		    (asdf:clear-system c)))
diff --git a/cl-annot.asd b/cl-annot.asd
index bbade60..8f9a807 100644
--- a/cl-annot.asd
+++ b/cl-annot.asd
@@ -27,4 +27,5 @@
                                            (:file "eval-when")
                                            (:file "doc")
                                            (:file "class")
-                                           (:file "slot")))))))
+                                           (:file "slot"))))))
+  :in-order-to ((test-op (test-op cl-annot-test))))