diff --git a/dev.metalisp.survey.asd b/dev.metalisp.survey.asd
index df1afd0..1a7d6e3 100644
--- a/dev.metalisp.survey.asd
+++ b/dev.metalisp.survey.asd
@@ -43,3 +43,12 @@
                               :components ((:file "package")
                                            (:file "view")
                                            (:file "handler")))))))
+
+(defsystem "dev.metalisp.survey/tests"
+  :description "Test system for survey"
+  :author "Marcus Kammer"
+  :license "MIT"
+  :depends-on ("dev.metalisp.survey" "fiveam")
+  :components ((:module "tests/"
+                :components ((:file "survey"))))
+  :perform (test-op (o c) (symbol-call :fiveam :run! :assessment)))
diff --git a/tests/survey.lisp b/tests/survey.lisp
new file mode 100644
index 0000000..e69de29