diff --git a/go/packages/golist/golist.go b/go/packages/golist/golist.go
index ec481cf0..222a0f47 100644
--- a/go/packages/golist/golist.go
+++ b/go/packages/golist/golist.go
@@ -57,16 +57,27 @@ func LoadRaw(ctx context.Context, cfg *raw.Config, patterns ...string) ([]string
 		patterns = restPatterns
 	}
 
-	listfunc := golistPackages
+	// TODO(matloob): Remove the definition of listfunc and just use golistPackages once go1.12 is released.
+	var listfunc func(ctx context.Context, cfg *raw.Config, words ...string) ([]string, []*raw.Package, error)
+	listfunc = func(ctx context.Context, cfg *raw.Config, words ...string) ([]string, []*raw.Package, error) {
+		roots, pkgs, err := golistPackages(ctx, cfg, patterns...)
+		if _, ok := err.(goTooOldError); ok {
+			listfunc = golistPackagesFallback
+			roots, pkgs, err = listfunc(ctx, cfg, patterns...)
+		}
+		listfunc = golistPackages
+		return roots, pkgs, err
+	}
+
+	roots, pkgs, err := []string(nil), []*raw.Package(nil), error(nil)
+
 	// TODO(matloob): Patterns may now be empty, if it was solely comprised of contains: patterns.
 	// See if the extra process invocation can be avoided.
-	roots, pkgs, err := listfunc(ctx, cfg, patterns...)
-	if _, ok := err.(goTooOldError); ok {
-		listfunc = golistPackagesFallback
+	if len(patterns) > 0 {
 		roots, pkgs, err = listfunc(ctx, cfg, patterns...)
-	}
-	if err != nil {
-		return nil, nil, err
+		if err != nil {
+			return nil, nil, err
+		}
 	}
 
 	// Run go list for contains: patterns.
@@ -107,23 +118,24 @@ func LoadRaw(ctx context.Context, cfg *raw.Config, patterns ...string) ([]string
 // Fields must match go list;
 // see $GOROOT/src/cmd/go/internal/load/pkg.go.
 type jsonPackage struct {
-	ImportPath   string
-	Dir          string
-	Name         string
-	Export       string
-	GoFiles      []string
-	CFiles       []string
-	CgoFiles     []string
-	SFiles       []string
-	Imports      []string
-	ImportMap    map[string]string
-	Deps         []string
-	TestGoFiles  []string
-	TestImports  []string
-	XTestGoFiles []string
-	XTestImports []string
-	ForTest      string // q in a "p [q.test]" package, else ""
-	DepOnly      bool
+	ImportPath      string
+	Dir             string
+	Name            string
+	Export          string
+	GoFiles         []string
+	CompiledGoFiles []string
+	CFiles          []string
+	CgoFiles        []string
+	SFiles          []string
+	Imports         []string
+	ImportMap       map[string]string
+	Deps            []string
+	TestGoFiles     []string
+	TestImports     []string
+	XTestGoFiles    []string
+	XTestImports    []string
+	ForTest         string // q in a "p [q.test]" package, else ""
+	DepOnly         bool
 }
 
 // golistPackages uses the "go list" command to expand the
@@ -230,13 +242,18 @@ func golistPackages(ctx context.Context, cfg *raw.Config, words ...string) ([]st
 		}
 
 		pkg := &raw.Package{
-			ID:         id,
-			Name:       p.Name,
-			GoFiles:    absJoin(p.Dir, p.GoFiles, p.CgoFiles),
-			OtherFiles: absJoin(p.Dir, p.SFiles, p.CFiles),
-			PkgPath:    pkgpath,
-			Imports:    imports,
-			Export:     export,
+			ID:              id,
+			Name:            p.Name,
+			GoFiles:         absJoin(p.Dir, p.GoFiles, p.CgoFiles),
+			CompiledGoFiles: absJoin(p.Dir, p.CompiledGoFiles),
+			OtherFiles:      absJoin(p.Dir, p.SFiles, p.CFiles),
+			PkgPath:         pkgpath,
+			Imports:         imports,
+			Export:          export,
+		}
+		// TODO(matloob): Temporary hack since CompiledGoFiles isn't always set.
+		if len(pkg.CompiledGoFiles) == 0 {
+			pkg.CompiledGoFiles = pkg.GoFiles
 		}
 		if !p.DepOnly {
 			roots = append(roots, pkg.ID)
@@ -262,7 +279,7 @@ func absJoin(dir string, fileses ...[]string) (res []string) {
 
 func golistargs(cfg *raw.Config, words []string) []string {
 	fullargs := []string{
-		"list", "-e", "-json",
+		"list", "-e", "-json", "-compiled",
 		fmt.Sprintf("-test=%t", cfg.Tests),
 		fmt.Sprintf("-export=%t", cfg.Export),
 		fmt.Sprintf("-deps=%t", cfg.Deps),
diff --git a/go/packages/golist/golist_fallback.go b/go/packages/golist/golist_fallback.go
index a582434f..b82a2b23 100644
--- a/go/packages/golist/golist_fallback.go
+++ b/go/packages/golist/golist_fallback.go
@@ -65,12 +65,13 @@ func golistPackagesFallback(ctx context.Context, cfg *raw.Config, words ...strin
 			roots = append(roots, id)
 		}
 		result = append(result, &raw.Package{
-			ID:         id,
-			Name:       p.Name,
-			GoFiles:    absJoin(p.Dir, p.GoFiles, p.CgoFiles),
-			OtherFiles: absJoin(p.Dir, p.SFiles, p.CFiles),
-			PkgPath:    pkgpath,
-			Imports:    importMap(p.Imports),
+			ID:              id,
+			Name:            p.Name,
+			GoFiles:         absJoin(p.Dir, p.GoFiles, p.CgoFiles),
+			CompiledGoFiles: absJoin(p.Dir, p.GoFiles, p.CgoFiles), // TODO(matloob): Use cgo-processed Go files instead of p.GoFiles
+			OtherFiles:      absJoin(p.Dir, p.SFiles, p.CFiles),
+			PkgPath:         pkgpath,
+			Imports:         importMap(p.Imports),
 		})
 		if cfg.Tests {
 			testID := fmt.Sprintf("%s [%s.test]", id, id)
@@ -79,12 +80,13 @@ func golistPackagesFallback(ctx context.Context, cfg *raw.Config, words ...strin
 					roots = append(roots, testID)
 				}
 				result = append(result, &raw.Package{
-					ID:         testID,
-					Name:       p.Name,
-					GoFiles:    absJoin(p.Dir, p.GoFiles, p.TestGoFiles, p.CgoFiles),
-					OtherFiles: absJoin(p.Dir, p.SFiles, p.CFiles),
-					PkgPath:    pkgpath,
-					Imports:    importMap(append(p.Imports, p.TestImports...)),
+					ID:              testID,
+					Name:            p.Name,
+					GoFiles:         absJoin(p.Dir, p.GoFiles, p.TestGoFiles, p.CgoFiles),
+					CompiledGoFiles: absJoin(p.Dir, p.GoFiles, p.TestGoFiles, p.CgoFiles), // TODO(matloob): Use cgo-processed Go files instead of p.GoFiles
+					OtherFiles:      absJoin(p.Dir, p.SFiles, p.CFiles),
+					PkgPath:         pkgpath,
+					Imports:         importMap(append(p.Imports, p.TestImports...)),
 				})
 			}
 			if len(p.XTestGoFiles) > 0 {
@@ -99,11 +101,12 @@ func golistPackagesFallback(ctx context.Context, cfg *raw.Config, words ...strin
 					}
 				}
 				result = append(result, &raw.Package{
-					ID:      xtestID,
-					Name:    p.Name + "_test",
-					GoFiles: absJoin(p.Dir, p.XTestGoFiles),
-					PkgPath: pkgpath,
-					Imports: importMap(p.XTestImports),
+					ID:              xtestID,
+					Name:            p.Name + "_test",
+					GoFiles:         absJoin(p.Dir, p.XTestGoFiles),
+					CompiledGoFiles: absJoin(p.Dir, p.XTestGoFiles),
+					PkgPath:         pkgpath,
+					Imports:         importMap(p.XTestImports),
 				})
 			}
 		}
diff --git a/go/packages/packages.go b/go/packages/packages.go
index 370713c2..e869af0b 100644
--- a/go/packages/packages.go
+++ b/go/packages/packages.go
@@ -464,7 +464,7 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 		lpkg.Errors = append(lpkg.Errors, err)
 	}
 
-	files, errs := ld.parseFiles(lpkg.GoFiles)
+	files, errs := ld.parseFiles(lpkg.raw.CompiledGoFiles)
 	for _, err := range errs {
 		appendError(err)
 	}
diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go
index 6c037f08..46efa8bd 100644
--- a/go/packages/packages_test.go
+++ b/go/packages/packages_test.go
@@ -671,6 +671,9 @@ func TestWholeProgramOverlay(t *testing.T) {
 }
 
 func TestWholeProgramImportErrors(t *testing.T) {
+	// TODO(matloob): Remove this once go list -e -compiled is fixed. See golang.org/issue/26755
+	t.Skip("go list -compiled -e fails with non-zero exit status for empty packages")
+
 	if usesOldGolist {
 		t.Skip("not yet supported in pre-Go 1.10.4 golist fallback implementation")
 	}