diff --git a/Eldev b/Eldev
index 68641f9..7a30881 100644
--- a/Eldev
+++ b/Eldev
@@ -29,8 +29,8 @@
 ;; Exclude tests merged from clojure-mode from running, linting and byte compiling
 (setf eldev-test-fileset
       `(:and ,eldev-test-fileset
-             (:not "./clojure-mode-*")))
+             (:not "./clojure-mode-tests/*")))
 (setf eldev-standard-excludes
-      `(:or ,eldev-standard-excludes "./clojure-mode-*"))
+      `(:or ,eldev-standard-excludes "./clojure-mode-tests/*"))
 (setf eldev-lint-ignored-fileset
-      `(:or ,eldev-lint-ignored-fileset "./clojure-mode-*"))
+      `(:or ,eldev-lint-ignored-fileset "./clojure-mode-tests/*"))
diff --git a/clojure-mode-convert-collection-test.el b/clojure-mode-tests/clojure-mode-convert-collection-test.el
similarity index 100%
rename from clojure-mode-convert-collection-test.el
rename to clojure-mode-tests/clojure-mode-convert-collection-test.el
diff --git a/clojure-mode-cycling-test.el b/clojure-mode-tests/clojure-mode-cycling-test.el
similarity index 100%
rename from clojure-mode-cycling-test.el
rename to clojure-mode-tests/clojure-mode-cycling-test.el
diff --git a/clojure-mode-external-interaction-test.el b/clojure-mode-tests/clojure-mode-external-interaction-test.el
similarity index 100%
rename from clojure-mode-external-interaction-test.el
rename to clojure-mode-tests/clojure-mode-external-interaction-test.el
diff --git a/clojure-mode-font-lock-test.el b/clojure-mode-tests/clojure-mode-font-lock-test.el
similarity index 100%
rename from clojure-mode-font-lock-test.el
rename to clojure-mode-tests/clojure-mode-font-lock-test.el
diff --git a/clojure-mode-indentation-test.el b/clojure-mode-tests/clojure-mode-indentation-test.el
similarity index 100%
rename from clojure-mode-indentation-test.el
rename to clojure-mode-tests/clojure-mode-indentation-test.el
diff --git a/clojure-mode-promote-fn-literal-test.el b/clojure-mode-tests/clojure-mode-promote-fn-literal-test.el
similarity index 100%
rename from clojure-mode-promote-fn-literal-test.el
rename to clojure-mode-tests/clojure-mode-promote-fn-literal-test.el
diff --git a/clojure-mode-refactor-add-arity-test.el b/clojure-mode-tests/clojure-mode-refactor-add-arity-test.el
similarity index 100%
rename from clojure-mode-refactor-add-arity-test.el
rename to clojure-mode-tests/clojure-mode-refactor-add-arity-test.el
diff --git a/clojure-mode-refactor-let-test.el b/clojure-mode-tests/clojure-mode-refactor-let-test.el
similarity index 100%
rename from clojure-mode-refactor-let-test.el
rename to clojure-mode-tests/clojure-mode-refactor-let-test.el
diff --git a/clojure-mode-refactor-rename-ns-alias-test.el b/clojure-mode-tests/clojure-mode-refactor-rename-ns-alias-test.el
similarity index 100%
rename from clojure-mode-refactor-rename-ns-alias-test.el
rename to clojure-mode-tests/clojure-mode-refactor-rename-ns-alias-test.el
diff --git a/clojure-mode-refactor-threading-test.el b/clojure-mode-tests/clojure-mode-refactor-threading-test.el
similarity index 100%
rename from clojure-mode-refactor-threading-test.el
rename to clojure-mode-tests/clojure-mode-refactor-threading-test.el
diff --git a/clojure-mode-safe-eval-test.el b/clojure-mode-tests/clojure-mode-safe-eval-test.el
similarity index 100%
rename from clojure-mode-safe-eval-test.el
rename to clojure-mode-tests/clojure-mode-safe-eval-test.el
diff --git a/clojure-mode-sexp-test.el b/clojure-mode-tests/clojure-mode-sexp-test.el
similarity index 100%
rename from clojure-mode-sexp-test.el
rename to clojure-mode-tests/clojure-mode-sexp-test.el
diff --git a/clojure-mode-syntax-test.el b/clojure-mode-tests/clojure-mode-syntax-test.el
similarity index 100%
rename from clojure-mode-syntax-test.el
rename to clojure-mode-tests/clojure-mode-syntax-test.el
diff --git a/clojure-mode-util-test.el b/clojure-mode-tests/clojure-mode-util-test.el
similarity index 100%
rename from clojure-mode-util-test.el
rename to clojure-mode-tests/clojure-mode-util-test.el