diff --git a/CODEOWNERS b/CODEOWNERS
index d490eadf76d..0c61625c878 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -172,7 +172,7 @@ guix/build-system/go\.scm                          @guix/go
 guix/build/go-build-system\.scm                    @guix/go
 guix/import/go\.scm                                @guix/go
 guix/scripts/import/go\.scm                        @guix/go
-tests/go\.scm                                      @guix/go
+tests/import/go\.scm                               @guix/go
 
 gnu/packages/dhall\.scm                            @guix/haskell
 gnu/packages/haskell(-.+|)\.scm$                   @guix/haskell
diff --git a/Makefile.am b/Makefile.am
index c603e4b3933..83f4dacd2de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -635,9 +635,9 @@ SCM_TESTS =					\
   tests/workers.scm
 
 if HAVE_GUILE_LIB
-SCM_TESTS += tests/go.scm
+SCM_TESTS += tests/import/go.scm
 else
-EXTRA_DIST += tests/go.scm
+EXTRA_DIST += tests/import/go.scm
 endif
 
 if BUILD_DAEMON_OFFLOAD
diff --git a/etc/teams.scm b/etc/teams.scm
index e15a0f148da..b855dee3d3a 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -668,7 +668,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
                       "guix/build/go-build-system.scm"
                       "guix/import/go.scm"
                       "guix/scripts/import/go.scm"
-                      "tests/go.scm")))
+                      "tests/import/go.scm")))
 
 (define-team haskell
   (team 'haskell
diff --git a/tests/go.scm b/tests/import/go.scm
similarity index 100%
rename from tests/go.scm
rename to tests/import/go.scm