diff --git a/Makefile b/Makefile
index ca04834d3d..1d5d1df19e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ OVERALLS        := GO111MODULE=on overalls
 ARCH      := "`uname -s`"
 LINUX     := "Linux"
 MAC       := "Darwin"
-PACKAGE_LIST  := go list ./...| grep -vE "cmd" | grep -vE "test"
+PACKAGE_LIST  := go list ./...| grep -vE "cmd"
 PACKAGES  := $$($(PACKAGE_LIST))
 PACKAGE_DIRECTORIES := $(PACKAGE_LIST) | sed 's|github.com/pingcap/$(PROJECT)/||'
 FILES     := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go")
diff --git a/util/testutil/testutil.go b/util/testutil/testutil.go
index d57c5bf078..e673cf1462 100644
--- a/util/testutil/testutil.go
+++ b/util/testutil/testutil.go
@@ -178,7 +178,11 @@ func loadTestSuiteCases(filePath string) (res []testCases, err error) {
 	if err != nil {
 		return res, err
 	}
-	defer jsonFile.Close()
+	defer func() {
+		if err1 := jsonFile.Close(); err == nil && err1 != nil {
+			err = err1
+		}
+	}()
 	byteValue, err := ioutil.ReadAll(jsonFile)
 	if err != nil {
 		return res, err
@@ -283,7 +287,11 @@ func (t *TestData) GenerateOutputIfNeeded() error {
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer func() {
+		if err1 := file.Close(); err == nil && err1 != nil {
+			err = err1
+		}
+	}()
 	_, err = file.Write(buf.Bytes())
 	return err
 }