diff --git a/test/core/test-core-lib-buffers.el b/test/core/autoload/test-buffers.el
similarity index 94%
rename from test/core/test-core-lib-buffers.el
rename to test/core/autoload/test-buffers.el
index 33d5d797f..10efdc77e 100644
--- a/test/core/test-core-lib-buffers.el
+++ b/test/core/autoload/test-buffers.el
@@ -1,6 +1,6 @@
-;;; ../test/test-core-lib-buffers.el
+;;; test/core/autoload/test-buffers.el
 
-(def-test-group! core-lib-buffers
+(def-test-group! core/autoload/buffers
   (ert-deftest get-buffers ()
     (let ((a (get-buffer-create "*a*"))
           (b (get-buffer-create "*b*"))
diff --git a/test/core/test-core-lib-package.el b/test/core/autoload/test-package.el
similarity index 97%
rename from test/core/test-core-lib-package.el
rename to test/core/autoload/test-package.el
index 96e16b52a..a1b3cde18 100644
--- a/test/core/test-core-lib-package.el
+++ b/test/core/autoload/test-package.el
@@ -1,4 +1,4 @@
-;;; ../test/test-core-lib-package.el
+;;; test/core/autoload/test-package.el
 
 (defun test-package-new (name version &optional reqs)
   (package-desc-create :name name :version version :reqs reqs))
@@ -23,7 +23,7 @@ affects your Emacs packages)."
 ;; Tests
 ;;
 
-(def-test-group! core-lib-package
+(def-test-group! core/autoload/package
   (ert-deftest backend-detection ()
     "TODO"
     (let ((package-alist `((doom-dummy ,(test-package-new 'doom-dummy '(20160405 1234)))))