diff --git a/CODEOWNERS b/CODEOWNERS
index f484ae45ae0..dde40e2f3c5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -260,7 +260,7 @@ guix/build-system/ocaml\.scm                       @guix/ocaml
 guix/build-system/dune\.scm                        @guix/ocaml
 guix/import/opam\.scm                              @guix/ocaml
 guix/scripts/import/opam\.scm                      @guix/ocaml
-tests/opam\.scm                                    @guix/ocaml
+tests/import/opam\.scm                             @guix/ocaml
 
 gnu/packages/django\.scm                           @guix/python
 gnu/packages/jupyter\.scm                          @guix/python
diff --git a/Makefile.am b/Makefile.am
index 0bbfcaa13a3..1d70d8d278e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -572,6 +572,7 @@ SCM_TESTS =					\
   tests/import/gem.scm				\
   tests/import/git.scm				\
   tests/import/hackage.scm			\
+  tests/import/opam.scm				\
   tests/import/pypi.scm				\
   tests/home-import.scm				\
   tests/home-services.scm			\
@@ -589,7 +590,6 @@ SCM_TESTS =					\
   tests/nar.scm				\
   tests/npm-binary.scm				\
   tests/networking.scm				\
-  tests/opam.scm				\
   tests/openpgp.scm				\
   tests/packages.scm				\
   tests/pack.scm				\
diff --git a/etc/teams.scm b/etc/teams.scm
index dcf4e46afab..d38f0ef831d 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -839,7 +839,7 @@ importer, and the ocaml-build-system."
               "guix/build-system/dune.scm"
               "guix/import/opam.scm"
               "guix/scripts/import/opam.scm"
-              "tests/opam.scm")))
+              "tests/import/opam.scm")))
 
 (define-team python
   (team 'python
diff --git a/tests/opam.scm b/tests/import/opam.scm
similarity index 100%
rename from tests/opam.scm
rename to tests/import/opam.scm