diff --git a/src/go/go2go/go2go.go b/src/go/go2go/go2go.go
index d1928bf14f..9766220819 100644
--- a/src/go/go2go/go2go.go
+++ b/src/go/go2go/go2go.go
@@ -95,9 +95,7 @@ func rewriteFilesInPath(importer *Importer, importPath, dir string, go2files []s
 			return nil, fmt.Errorf("type checking failed for %s\n%v", pkg.Name, merr)
 		}
 
-		if !strings.HasSuffix(pkg.Name, "_test") {
-			importer.record(pkgfiles, importPath, tpkg, asts)
-		}
+		importer.record(pkg.Name, pkgfiles, importPath, tpkg, asts)
 
 		rpkgs = append(rpkgs, tpkg)
 		tpkgs = append(tpkgs, pkgfiles)
diff --git a/src/go/go2go/importer.go b/src/go/go2go/importer.go
index 8f2a35dd2e..c1e9536520 100644
--- a/src/go/go2go/importer.go
+++ b/src/go/go2go/importer.go
@@ -296,11 +296,13 @@ func (imp *Importer) localImport(importPath, dir string) (*types.Package, error)
 
 // record records information for a package, for use when working
 // with packages that import this one.
-func (imp *Importer) record(pkgfiles []namedAST, importPath string, tpkg *types.Package, asts []*ast.File) {
-	if importPath != "" {
-		imp.packages[importPath] = tpkg
+func (imp *Importer) record(pkgName string, pkgfiles []namedAST, importPath string, tpkg *types.Package, asts []*ast.File) {
+	if !strings.HasSuffix(pkgName, "_test") {
+		if importPath != "" {
+			imp.packages[importPath] = tpkg
+		}
+		imp.imports[importPath] = imp.collectImports(asts)
 	}
-	imp.imports[importPath] = imp.collectImports(asts)
 	for _, nast := range pkgfiles {
 		imp.addIDs(nast.ast)
 	}