diff --git a/CODEOWNERS b/CODEOWNERS
index 1c81bec433f..7236b58af81 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -273,7 +273,7 @@ guix/build/python-build-system\.scm                @guix/python
 guix/build-system/python\.scm                      @guix/python
 guix/import/pypi\.scm                              @guix/python
 guix/scripts/import/pypi\.scm                      @guix/python
-tests/pypi\.scm                                    @guix/python
+tests/import/pypi\.scm                             @guix/python
 
 gnu/packages/qt\.scm                               @guix/qt
 guix/build-system/qt\.scm                          @guix/qt
diff --git a/Makefile.am b/Makefile.am
index b29f2dfa84a..fec29393790 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -571,6 +571,7 @@ SCM_TESTS =					\
   tests/gremlin.scm				\
   tests/hackage.scm				\
   tests/hexpm.scm				\
+  tests/import/pypi.scm				\
   tests/home-import.scm				\
   tests/home-services.scm			\
   tests/http-client.scm				\
@@ -597,7 +598,6 @@ SCM_TESTS =					\
   tests/processes.scm				\
   tests/profiles.scm				\
   tests/publish.scm				\
-  tests/pypi.scm				\
   tests/read-print.scm				\
   tests/records.scm				\
   tests/rpm.scm					\
diff --git a/etc/teams.scm b/etc/teams.scm
index 8a75b68d70e..270f6c69bb7 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -858,7 +858,7 @@ importer, and the ocaml-build-system."
               "guix/build-system/python.scm"
               "guix/import/pypi.scm"
               "guix/scripts/import/pypi.scm"
-              "tests/pypi.scm")))
+              "tests/import/pypi.scm")))
 
 (define-team qt
   (team 'qt
diff --git a/tests/pypi.scm b/tests/import/pypi.scm
similarity index 100%
rename from tests/pypi.scm
rename to tests/import/pypi.scm