diff --git a/CODEOWNERS b/CODEOWNERS
index 6fe2544a97f..f484ae45ae0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -140,7 +140,7 @@ guix/build/emacs-utils\.scm                        @guix/emacs
 guix/build-system/emacs\.scm                       @guix/emacs
 guix/import/elpa\.scm                              @guix/emacs
 guix/scripts/import/elpa\.scm                      @guix/emacs
-tests/elpa\.scm                                    @guix/emacs
+tests/import/elpa\.scm                             @guix/emacs
 
 gnu/packages/bootloaders\.scm                      @guix/embedded
 gnu/packages/firmware\.scm                         @guix/embedded
diff --git a/Makefile.am b/Makefile.am
index ff87e9baf28..0bbfcaa13a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -553,7 +553,6 @@ SCM_TESTS =					\
   tests/debug-link.scm				\
   tests/derivations.scm			\
   tests/discovery.scm				\
-  tests/elpa.scm				\
   tests/file-systems.scm			\
   tests/gexp.scm				\
   tests/git.scm					\
@@ -569,6 +568,7 @@ SCM_TESTS =					\
   tests/import/crate.scm			\
   tests/import/egg.scm				\
   tests/import/elm.scm				\
+  tests/import/elpa.scm				\
   tests/import/gem.scm				\
   tests/import/git.scm				\
   tests/import/hackage.scm			\
diff --git a/etc/teams.scm b/etc/teams.scm
index 1f5a2da6228..dcf4e46afab 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -620,7 +620,7 @@ ecosystem."
                       "guix/build-system/emacs.scm"
                       "guix/import/elpa.scm"
                       "guix/scripts/import/elpa.scm"
-                      "tests/elpa.scm")))
+                      "tests/import/elpa.scm")))
 
 (define-team embedded
   (team 'embedded
diff --git a/tests/elpa.scm b/tests/import/elpa.scm
similarity index 100%
rename from tests/elpa.scm
rename to tests/import/elpa.scm