diff --git a/test/run.go b/test/run.go
index b6437ee1d3..b79323dd17 100644
--- a/test/run.go
+++ b/test/run.go
@@ -522,7 +522,9 @@ func (t *test) errorCheck(outStr string, full, short string) (err error) {
 		}
 		if strings.HasPrefix(line, "\t") {
 			out[len(out)-1] += "\n" + line
-		} else {
+		} else if strings.HasPrefix(line, "go tool") {
+			continue
+		} else if strings.TrimSpace(line) != "" {
 			out = append(out, line)
 		}
 	}
@@ -553,6 +555,13 @@ func (t *test) errorCheck(outStr string, full, short string) (err error) {
 		}
 	}
 
+	if len(out) > 0 {
+		errs = append(errs, fmt.Errorf("Unmatched Errors:"))
+		for _, errLine := range out {
+			errs = append(errs, fmt.Errorf("%s", errLine))
+		}
+	}
+
 	if len(errs) == 0 {
 		return nil
 	}