diff --git a/config/tendermint_test/config.go b/config/tendermint_test/config.go
index 12bf3669..a2c5570e 100644
--- a/config/tendermint_test/config.go
+++ b/config/tendermint_test/config.go
@@ -28,14 +28,18 @@ func initTMRoot(rootDir string) {
 	rootDir = getTMRoot(rootDir)
 
 	// Remove ~/.tendermint_test_bak
-	err := os.RemoveAll(rootDir + "_bak")
-	if err != nil {
-		PanicSanity(err.Error())
+	if FileExists(rootDir + "_bak") {
+		err := os.RemoveAll(rootDir + "_bak")
+		if err != nil {
+			PanicSanity(err.Error())
+		}
 	}
 	// Move ~/.tendermint_test to ~/.tendermint_test_bak
-	err = os.Rename(rootDir, rootDir+"_bak")
-	if err != nil {
-		PanicSanity(err.Error())
+	if FileExists(rootDir + "_bak") {
+		err := os.Rename(rootDir, rootDir+"_bak")
+		if err != nil {
+			PanicSanity(err.Error())
+		}
 	}
 	// Create new dir
 	EnsureDir(rootDir, 0700)