diff --git a/build.boot b/build.boot
index 071de0f..6455c49 100644
--- a/build.boot
+++ b/build.boot
@@ -52,7 +52,7 @@
   (in-ns 'dev))
 
 (deftask test []
-  (set-env! :source-paths #(conj % "test" "test/clj")) ;; (!) :source-paths must not overlap.
+  (set-env! :source-paths #(conj % "test/core" "test/clj")) ;; (!) :source-paths must not overlap.
   (bt/test))
 
 (task-options!
diff --git a/project.clj b/project.clj
index 691833c..6d4b759 100644
--- a/project.clj
+++ b/project.clj
@@ -61,4 +61,4 @@
                                          :optimizations :advanced
                                          :pretty-print false}}}}}
 
-             :test {:source-paths ["test" "test/clj" "test/cljs"]}})
+             :test {:source-paths ["test/core" "test/clj" "test/cljs"]}})
diff --git a/test/mount/test.cljc b/test/core/mount/test.cljc
similarity index 100%
rename from test/mount/test.cljc
rename to test/core/mount/test.cljc
diff --git a/test/mount/test/cleanup_dirty_states.cljc b/test/core/mount/test/cleanup_dirty_states.cljc
similarity index 100%
rename from test/mount/test/cleanup_dirty_states.cljc
rename to test/core/mount/test/cleanup_dirty_states.cljc
diff --git a/test/mount/test/fun_with_values.cljc b/test/core/mount/test/fun_with_values.cljc
similarity index 100%
rename from test/mount/test/fun_with_values.cljc
rename to test/core/mount/test/fun_with_values.cljc
diff --git a/test/mount/test/helper.cljc b/test/core/mount/test/helper.cljc
similarity index 100%
rename from test/mount/test/helper.cljc
rename to test/core/mount/test/helper.cljc
diff --git a/test/mount/test/parts.cljc b/test/core/mount/test/parts.cljc
similarity index 100%
rename from test/mount/test/parts.cljc
rename to test/core/mount/test/parts.cljc
diff --git a/test/mount/test/private_fun.cljc b/test/core/mount/test/private_fun.cljc
similarity index 100%
rename from test/mount/test/private_fun.cljc
rename to test/core/mount/test/private_fun.cljc
diff --git a/test/mount/test/start_with.cljc b/test/core/mount/test/start_with.cljc
similarity index 100%
rename from test/mount/test/start_with.cljc
rename to test/core/mount/test/start_with.cljc
diff --git a/test/mount/test/start_without.cljc b/test/core/mount/test/start_without.cljc
similarity index 100%
rename from test/mount/test/start_without.cljc
rename to test/core/mount/test/start_without.cljc
diff --git a/test/mount/test/stop_except.cljc b/test/core/mount/test/stop_except.cljc
similarity index 100%
rename from test/mount/test/stop_except.cljc
rename to test/core/mount/test/stop_except.cljc
diff --git a/test/mount/test/suspend_resume.cljc b/test/core/mount/test/suspend_resume.cljc
similarity index 100%
rename from test/mount/test/suspend_resume.cljc
rename to test/core/mount/test/suspend_resume.cljc
diff --git a/test/mount/test/var/fun_with_values.clj b/test/core/mount/test/var/fun_with_values.clj
similarity index 100%
rename from test/mount/test/var/fun_with_values.clj
rename to test/core/mount/test/var/fun_with_values.clj
diff --git a/test/mount/test/var/private_fun.clj b/test/core/mount/test/var/private_fun.clj
similarity index 100%
rename from test/mount/test/var/private_fun.clj
rename to test/core/mount/test/var/private_fun.clj