diff --git a/dodb.asd b/dodb.asd
new file mode 100644
index 0000000..6a83ae0
--- /dev/null
+++ b/dodb.asd
@@ -0,0 +1,22 @@
+(defsystem "dodb"
+  :version "0.1.0"
+  :author "Philippe PITTOLI"
+  :license "ISC"
+  :depends-on ("osicat")
+  :components ((:module "src"
+                :components
+                ((:file "util")
+                 (:file "main"))))
+  :description "When storing simple files directly on the file-system is enough."
+  :in-order-to ((test-op (test-op "dodb/tests"))))
+
+(defsystem "dodb/tests"
+  :author "Philippe PITTOLI"
+  :license "ISC"
+  :depends-on ("dodb"
+               "rove")
+  :components ((:module "tests"
+                :components
+                ((:file "main"))))
+  :description "Test system for dodb"
+  :perform (test-op (op c) (symbol-call :rove :run c)))
diff --git a/src/dodb.cl b/src/main.lisp
similarity index 99%
rename from src/dodb.cl
rename to src/main.lisp
index 3fc0602..28757ed 100644
--- a/src/dodb.cl
+++ b/src/main.lisp
@@ -1,6 +1,3 @@
-(ql:quickload "osicat")
-
-; (load "./util.cl")
 (defpackage :dodb
   (:use :common-lisp :util)
   ; TODO
diff --git a/src/util.cl b/src/util.lisp
similarity index 95%
rename from src/util.cl
rename to src/util.lisp
index 40332d3..90f7312 100644
--- a/src/util.cl
+++ b/src/util.lisp
@@ -1,5 +1,3 @@
-; (make-package :ut)
-; (in-package :ut)
 (defpackage :util
   (:use :common-lisp)
   (:nicknames :ut)
diff --git a/tests/main.lisp b/tests/main.lisp
new file mode 100644
index 0000000..747180f
--- /dev/null
+++ b/tests/main.lisp
@@ -0,0 +1,11 @@
+(defpackage dodb/tests/main
+  (:use :cl
+        :dodb
+        :rove))
+(in-package :dodb/tests/main)
+
+;; NOTE: To run this test file, execute `(asdf:test-system :dodb)' in your Lisp.
+
+(deftest test-target-1
+  (testing "should (= 1 1) to be true"
+    (ok (= 1 1))))