diff --git a/build b/build
index dd79e8d9a..27a1afa66 100755
--- a/build
+++ b/build
@@ -7,7 +7,7 @@ fi
 
 export GOBIN=${PWD}/bin
 export GOPATH=${PWD}
-export GOFMTPATH="./bench ./config ./discovery ./error etcd.go ./http ./log ./machines ./metrics ./mod profile.go ./server ./store ./tests"
+export GOFMTPATH="./bench ./config ./discovery ./etcd ./error ./http ./log ./machines main.go ./metrics ./mod ./server ./store ./tests"
 
 # Don't surprise user by formatting their codes by stealth
 if [ "$1" == "--fmt" ]; then
diff --git a/test.sh b/test.sh
index 42a5075a8..981649bcf 100755
--- a/test.sh
+++ b/test.sh
@@ -2,13 +2,6 @@
 
 . ./build
 
-fmtRes=`gofmt -l $GOFMTPATH`
-if [ "$fmtRes" != "" ]; then
-	echo "Failed to pass golang format checking."
-	echo "Please gofmt modified go files, or run './build --fmt'."
-	exit 1
-fi
-
 go test -i ./http
 go test -v ./http
 
@@ -32,3 +25,10 @@ go test -v ./mod/lock/v2/tests
 
 go test -i ./tests/functional
 ETCD_BIN_PATH=$(pwd)/bin/etcd go test -v ./tests/functional
+
+fmtRes=`gofmt -l $GOFMTPATH`
+if [ "$fmtRes" != "" ]; then
+	echo "Failed to pass golang format checking."
+	echo "Please gofmt modified go files, or run './build --fmt'."
+	exit 1
+fi