diff --git a/cmd/build.go b/cmd/build.go
index 3a5e3f8..cce6cd6 100644
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -46,11 +46,7 @@ goc build -- -ldflags "-extldflags -static" -tags="embed kodo"
 	Run: func(cmd *cobra.Command, args []string) {
 		gocBuild := build.NewBuild(buildFlags, packages, buildOutput)
 		// remove temporary directory if needed
-		defer func() {
-			if !debugGoc {
-				gocBuild.Clean()
-			}
-		}()
+		defer gocBuild.Clean()
 		// doCover with original buildFlags, with new GOPATH( tmp:original )
 		// in the tmp directory
 		cover.Execute(buildFlags, gocBuild.NewGOPATH, gocBuild.TmpDir, mode, center)
diff --git a/cmd/install.go b/cmd/install.go
index 625210b..66f1f5e 100644
--- a/cmd/install.go
+++ b/cmd/install.go
@@ -43,11 +43,7 @@ goc build --buildflags="-ldflags '-extldflags -static' -tags='embed kodo'"
 	Run: func(cmd *cobra.Command, args []string) {
 		gocBuild := build.NewInstall(buildFlags, packages)
 		// remove temporary directory if needed
-		defer func() {
-			if !debugGoc {
-				gocBuild.Clean()
-			}
-		}()
+		defer gocBuild.Clean()
 		// doCover with original buildFlags, with new GOPATH( tmp:original )
 		// in the tmp directory
 		cover.Execute(buildFlags, gocBuild.NewGOPATH, gocBuild.TmpDir, mode, center)
diff --git a/cmd/run.go b/cmd/run.go
index 6cc0187..8863985 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -39,11 +39,7 @@ goc run .
 		gocBuild := build.NewBuild(buildFlags, packages, buildOutput)
 		gocBuild.GoRunExecFlag = goRunExecFlag
 		gocBuild.GoRunArguments = goRunArguments
-		defer func() {
-			if !debugGoc {
-				gocBuild.Clean()
-			}
-		}()
+		defer gocBuild.Clean()
 		// start goc server
 		var l = newLocalListener()
 		go cover.GocServer(ioutil.Discard).RunListener(l)
diff --git a/pkg/build/tmpfolder.go b/pkg/build/tmpfolder.go
index b80632f..d9de295 100644
--- a/pkg/build/tmpfolder.go
+++ b/pkg/build/tmpfolder.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/qiniu/goc/pkg/cover"
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 )
 
 func (b *Build) MvProjectsToTmp() {
@@ -155,5 +156,8 @@ func (b *Build) findWhereToInstall() string {
 
 // Clean clears up the temporary workspace
 func (b *Build) Clean() error {
-	return os.RemoveAll(b.TmpDir)
+	if !viper.GetBool("debug") {
+		return os.RemoveAll(b.TmpDir)
+	}
+	return nil
 }
diff --git a/pkg/cover/server.go b/pkg/cover/server.go
index 0545f1f..2d5adb0 100644
--- a/pkg/cover/server.go
+++ b/pkg/cover/server.go
@@ -26,9 +26,8 @@ import (
 	"net/url"
 	"os"
 
-	log "github.com/sirupsen/logrus"
-
 	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/tools/cover"
 	"k8s.io/test-infra/gopherage/pkg/cov"
 )