diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go
index 7e8487e..dc75f15 100644
--- a/go/packages/packages_test.go
+++ b/go/packages/packages_test.go
@@ -1543,41 +1543,37 @@
 
 func TestName_Modules(t *testing.T) {
 	// Test the top-level package case described in runNamedQueries.
-	// Note that overriding GOPATH below prevents Export from
-	// creating more than one module.
-	exported := packagestest.Export(t, packagestest.Modules, []packagestest.Module{{
-		Name: "golang.org/pkg",
-		Files: map[string]interface{}{
-			"pkg.go": `package pkg`,
-		}}})
+	exported := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
+		{
+			Name: "golang.org/pkg",
+			Files: map[string]interface{}{
+				"pkg.go": `package pkg`,
+			},
+		},
+		{
+			Name: "example.com/tools-testrepo",
+			Files: map[string]interface{}{
+				"pkg/pkg.go": `package pkg`,
+			},
+		},
+		{
+			Name: "example.com/tools-testrepo/v2",
+			Files: map[string]interface{}{
+				"pkg/pkg.go": `package pkg`,
+			},
+		},
+	})
 	defer exported.Cleanup()
 
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	gopath, err := ioutil.TempDir("", "TestName_Modules")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(gopath)
-	if err := copyAll(filepath.Join(wd, "testdata", "TestName_Modules"), gopath); err != nil {
-		t.Fatal(err)
-	}
-	// testdata/TestNamed_Modules contains:
-	// - pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/pkg
-	// - pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/pkg
-	// - src/b/pkg
 	exported.Config.Mode = packages.LoadImports
-	exported.Config.Env = append(exported.Config.Env, "GOPATH="+gopath)
 	initial, err := packages.Load(exported.Config, "iamashamedtousethedisabledqueryname=pkg")
 	if err != nil {
 		t.Fatal(err)
 	}
 	graph, _ := importGraph(initial)
 	wantGraph := `
-* github.com/heschik/tools-testrepo/pkg
-* github.com/heschik/tools-testrepo/v2/pkg
+* example.com/tools-testrepo/pkg
+* example.com/tools-testrepo/v2/pkg
 * golang.org/pkg
 `[1:]
 	if graph != wantGraph {
@@ -2504,7 +2500,7 @@
 		if err != nil {
 			return err
 		}
-		dstFilePath := filepath.Join(dstPath, rel)
+		dstFilePath := strings.Replace(filepath.Join(dstPath, rel), "definitelynot_go.mod", "go.mod", -1)
 		if err := os.MkdirAll(filepath.Dir(dstFilePath), 0755); err != nil {
 			return err
 		}
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/list b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/list
deleted file mode 100644
index 0ec25f7..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/list
+++ /dev/null
@@ -1 +0,0 @@
-v1.0.0
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.info b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.info
deleted file mode 100644
index 7cf03cc..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.info
+++ /dev/null
@@ -1 +0,0 @@
-{"Version":"v1.0.0","Time":"2018-09-28T22:09:08Z"}
\ No newline at end of file
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.mod b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.mod
deleted file mode 100644
index 9ff6699..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.mod
+++ /dev/null
@@ -1 +0,0 @@
-module github.com/heschik/tools-testrepo
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.zip b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.zip
deleted file mode 100644
index 810b334..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.zip
+++ /dev/null
Binary files differ
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.ziphash b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.ziphash
deleted file mode 100644
index 8ca2ba5..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/@v/v1.0.0.ziphash
+++ /dev/null
@@ -1 +0,0 @@
-h1:D2qc+R2eCTCyoT8WAYoExXhPBThJWmlYSfB4coWbfBE=
\ No newline at end of file
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/list b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/list
deleted file mode 100644
index 46b105a..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/list
+++ /dev/null
@@ -1 +0,0 @@
-v2.0.0
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.info b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.info
deleted file mode 100644
index 70e7d82..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.info
+++ /dev/null
@@ -1 +0,0 @@
-{"Version":"v2.0.0","Time":"2018-09-28T22:12:08Z"}
\ No newline at end of file
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.mod b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.mod
deleted file mode 100644
index b5298df..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.mod
+++ /dev/null
@@ -1 +0,0 @@
-module github.com/heschik/tools-testrepo/v2
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.zip b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.zip
deleted file mode 100644
index 3e16af0..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.zip
+++ /dev/null
Binary files differ
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.ziphash b/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.ziphash
deleted file mode 100644
index 0e1b44e..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/cache/download/github.com/heschik/tools-testrepo/v2/@v/v2.0.0.ziphash
+++ /dev/null
@@ -1 +0,0 @@
-h1:Ll4Bx8ZD8zg8lD4idX7CAhx/jh16o9dWC2m9SnT1qu0=
\ No newline at end of file
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/go.mod b/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/go.mod
deleted file mode 100644
index 7c7eee8..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/heschik/tools-testrepo/v2
-
-go 1.12
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/pkg/pkg.go b/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/pkg/pkg.go
deleted file mode 100644
index c1caffe..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.0/pkg/pkg.go
+++ /dev/null
@@ -1 +0,0 @@
-package pkg
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/go.mod b/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/go.mod
deleted file mode 100644
index f1a8d62..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/heschik/tools-testrepo
-
-go 1.12
diff --git a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/pkg/pkg.go b/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/pkg/pkg.go
deleted file mode 100644
index c1caffe..0000000
--- a/go/packages/testdata/TestName_Modules/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/pkg/pkg.go
+++ /dev/null
@@ -1 +0,0 @@
-package pkg
diff --git a/go/packages/testdata/TestName_Modules/src/b/pkg/pkg.go b/go/packages/testdata/TestName_Modules/src/b/pkg/pkg.go
deleted file mode 100644
index c1caffe..0000000
--- a/go/packages/testdata/TestName_Modules/src/b/pkg/pkg.go
+++ /dev/null
@@ -1 +0,0 @@
-package pkg
diff --git a/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.1/go.mod b/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.1/definitelynot_go.mod
similarity index 100%
rename from go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.1/go.mod
rename to go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.1/definitelynot_go.mod
diff --git a/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.2/go.mod b/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.2/definitelynot_go.mod
similarity index 100%
rename from go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.2/go.mod
rename to go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo/v2@v2.0.2/definitelynot_go.mod
diff --git a/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/go.mod b/go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/definitelynot_go.mod
similarity index 100%
rename from go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/go.mod
rename to go/packages/testdata/TestName_ModulesDedup/pkg/mod/github.com/heschik/tools-testrepo@v1.0.0/definitelynot_go.mod