diff --git a/dev.metalisp.qmetrics.asd b/dev.metalisp.qmetrics.asd
index 576f4d3..177bb09 100644
--- a/dev.metalisp.qmetrics.asd
+++ b/dev.metalisp.qmetrics.asd
@@ -7,6 +7,7 @@
   :license "MIT"
   :source-control (:git "git@git.sr.ht:~marcuskammer/dev.metalisp.qmetrics")
   :depends-on ("dev.metalisp.sbt")
+  :in-order-to ((test-op (test-op "dev.metalisp.qmetrics/tests")))
   :components ((:module "src/"
                 :components ((:file "stats")
                              (:module "assessment/"
@@ -17,3 +18,12 @@
                                            (:file "sus")
                                            (:file "visawi")
                                            (:file "nps")))))))
+
+(defsystem "dev.metalisp.qmetrics/tests"
+  :description "Test system for qmetrics"
+  :author "Marcus Kammer"
+  :license "MIT"
+  :depends-on ("dev.metalisp.qmetrics" "fiveam")
+  :components ((:module "tests/"
+                :components ((:file "tests"))))
+  :perform (test-op (o c) (symbol-call :fiveam :run! :first-tests)))
diff --git a/tests/tests.lisp b/tests/tests.lisp
new file mode 100644
index 0000000..1fdf2a0
--- /dev/null
+++ b/tests/tests.lisp
@@ -0,0 +1,15 @@
+;;; -*- mode: lisp; coding: utf-8; -*-
+(defpackage :ml-qmetrics/tests
+  (:use :cl :fiveam :ml-qmetrics/assessment))
+
+(in-package :ml-qmetrics/tests)
+
+(def-suite :first-tests
+  :description "Test suite for my-system")
+
+(in-suite :first-tests)
+
+(test test-something
+  (is (= 2 (+ 1 1)) "Basic addition should work"))
+
+;; Add more tests as needed