diff --git a/Makefile b/Makefile
index 9057f0dda..682579f5e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ build_race:
 
 test: build
 	-rm -rf ~/.tendermint_test_bak
-	-mv ~/.tendermint_test ~/.tendermint_test_bak
+	-mv ~/.tendermint_test ~/.tendermint_test_bak && true
 	go test github.com/tendermint/tendermint/...
 
 draw_deps:
diff --git a/config/tendermint_test/config.go b/config/tendermint_test/config.go
index 5aad9cafb..c208dc232 100644
--- a/config/tendermint_test/config.go
+++ b/config/tendermint_test/config.go
@@ -31,7 +31,6 @@ func initTMRoot(rootDir string) {
 
 	configFilePath := path.Join(rootDir, "config.toml")
 	genesisFilePath := path.Join(rootDir, "genesis.json")
-	privValFilePath := path.Join(rootDir, "priv_validator.json")
 
 	// Write default config file if missing.
 	if !FileExists(configFilePath) {
@@ -42,9 +41,6 @@ func initTMRoot(rootDir string) {
 	if !FileExists(genesisFilePath) {
 		MustWriteFile(genesisFilePath, []byte(defaultGenesis))
 	}
-	if !FileExists(privValFilePath) {
-		MustWriteFile(privValFilePath, []byte(privValFilePath))
-	}
 }
 
 func GetConfig(rootDir string) cfg.Config {
diff --git a/node/node_test.go b/node/node_test.go
index 94356be0a..05f3ca22e 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -4,16 +4,10 @@ import (
 	"testing"
 	"time"
 
-	cfg "github.com/tendermint/tendermint/config"
-	tmcfg "github.com/tendermint/tendermint/config/tendermint"
+	_ "github.com/tendermint/tendermint/config/tendermint_test"
 	"github.com/tendermint/tendermint/p2p"
 )
 
-func init() {
-	config := tmcfg.GetConfig("")
-	cfg.ApplyConfig(config)
-}
-
 func TestNodeStartStop(t *testing.T) {
 	// Create & start node
 	n := NewNode()