diff --git a/check-it-test.asd b/check-it-test.asd
new file mode 100644
index 0000000..568ca90
--- /dev/null
+++ b/check-it-test.asd
@@ -0,0 +1,15 @@
+(defsystem :check-it-test
+  :name "check-it-test"
+  :serial t
+  :author "Kyle Littler"
+  :license "LLGPL"
+  :description "Tests for check-it."
+  :components
+  ((:module :test
+            :components ((:file "package")
+                         (:file "check-it-test")
+                         (:file "deterministic-tests")
+                         (:file "randomized-tests")
+                         (:file "destructive-tests")
+                         (:file "for-travis"))))
+  :depends-on (:check-it :stefil))
diff --git a/check-it.asd b/check-it.asd
index 82af921..419032c 100644
--- a/check-it.asd
+++ b/check-it.asd
@@ -1,9 +1,5 @@
 ;;;; check-it.asd
 
-(defpackage :check-it-system
-  (:use :cl :asdf))
-(in-package :check-it-system)
-
 (defsystem :check-it
   :name "check-it"
   :serial t
@@ -25,25 +21,11 @@
                          (:file "shrink")
                          (:file "check-it"))
             :serial t))
-  :depends-on (:alexandria :closer-mop :optima)
+  :depends-on (:alexandria :closer-mop :trivia)
   :in-order-to ((test-op (load-op :check-it-test)))
   :perform (test-op :after (op c)
                     (funcall
                      (intern #.(string '#:run-all-tests)
                              :check-it-test))))
 
-(defsystem :check-it-test
-  :name "check-it-test"
-  :serial t
-  :author "Kyle Littler"
-  :license "LLGPL"
-  :description "Tests for check-it."
-  :components
-  ((:module :test
-            :components ((:file "package")
-                         (:file "check-it-test")
-                         (:file "deterministic-tests")
-                         (:file "randomized-tests")
-                         (:file "destructive-tests")
-                         (:file "for-travis"))))
-  :depends-on (:check-it :stefil))
+
diff --git a/src/package.lisp b/src/package.lisp
index 913a902..f217c12 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -1,7 +1,7 @@
 (in-package :cl-user)
 
 (defpackage :check-it
-  (:use :cl :alexandria :optima)
+  (:use :cl :alexandria :trivia)
   (:export #:shrink
            #:shrink-and-trap-errors