diff --git a/Makefile b/Makefile
index 94e23612823ae26f2ed5406ad2c0f56ae60f50f5..f86cf18fbd61b3a35ea99c25539a4b58dd25098f 100644
--- a/Makefile
+++ b/Makefile
@@ -65,13 +65,24 @@ static: link
 unit-test: link
 	echo $(GOPATH)
 	echo $(CURDIR)
-	go test -v github.com/containers/storage/drivers/devmapper
+	rm -rf $(CURDIR)/src/isula-image
+	mkdir -p $(CURDIR)/src/isula-image/cmd
+	cp -rf $(CURDIR)/cmd/isulad_img $(CURDIR)/src/isula-image/cmd/
+	cp -rf $(CURDIR)/isula $(CURDIR)/src/isula-image/
+	mkdir -p ${GOTMPDIR}
+	$(GPGME_ENV) go test ${GO_DYN_FLAGS} -ldflags "-extldflags -zrelro -extldflags -znow -tmpdir ${GOTMPDIR} -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -v -coverpkg=github.com/containers/storage/drivers/devmapper github.com/containers/storage/drivers/devmapper
+	$(GPGME_ENV) go test ${GO_DYN_FLAGS} -ldflags "-extldflags -zrelro -extldflags -znow -tmpdir ${GOTMPDIR} -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -v -coverpkg=isula-image/cmd/isulad_img isula-image/cmd/isulad_img
+	rm -rf ${GOTMPDIR}
+	rm -rf $(CURDIR)/src/isula-image
+	rm -f $(CURDIR)/src
 
 proto:
 	protoc --go_out=plugins=grpc:. ./isula/isula_image.proto
 
 clean:
 	rm -rf ${ISULAD_KIT_BIN}
+	rm -rf $(CURDIR)/src/isula-image
+	rm -f $(CURDIR)/src
 
 install:
 	install -d -m 755 ${INSTALLDIR}
diff --git a/cmd/isulad_img/cgo_pthread_ordering_workaround.go b/cmd/isulad_img/cgo_pthread_ordering_workaround.go
index fec0505d4cd075921cfb04049afab39da4d2a70b..794efdffb0de61da27f4634ea3aff9d90f5b5c5e 100644
--- a/cmd/isulad_img/cgo_pthread_ordering_workaround.go
+++ b/cmd/isulad_img/cgo_pthread_ordering_workaround.go
@@ -12,6 +12,7 @@
 // Create: 2019-05-06
 
 // +build !containers_image_openpgp
+
 package main
 
 // #cgo LDFLAGS: -lgpgme
diff --git a/cmd/isulad_img/filesystem_test.go b/cmd/isulad_img/filesystem_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..d963f3573b9e951e3fc6a16c3aeb3693a005384b
--- /dev/null
+++ b/cmd/isulad_img/filesystem_test.go
@@ -0,0 +1,26 @@
+// Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
+// iSulad-img licensed under the Mulan PSL v1.
+// You can use this software according to the terms and conditions of the Mulan PSL v1.
+// You may obtain a copy of Mulan PSL v1 at:
+//     http://license.coscl.org.cn/MulanPSL
+// THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+// PURPOSE.
+// See the Mulan PSL v1 for more details.
+// Description: iSulad image kit
+// Author: wangfengtu
+// Create: 2020-02-25
+
+package main
+
+import (
+	"testing"
+)
+
+func TestGetDiskUsageStats(t *testing.T) {
+	// Make sure it do not panic
+	_, _, err := GetDiskUsageStats("/proc")
+	if err != nil {
+		t.Errorf("GetDiskUsageStats failed: %v", err)
+	}
+}