diff --git a/client/keys/utils.go b/client/keys/utils.go
index eed7abc6cc..ebebf5d263 100644
--- a/client/keys/utils.go
+++ b/client/keys/utils.go
@@ -32,7 +32,7 @@ type KeyOutput struct {
 // GetKeyBase initializes a keybase based on the configuration
 func GetKeyBase() (keys.Keybase, error) {
 	if keybase == nil {
-		rootDir := filepath.Join(viper.GetString(cli.HomeFlag), ".basecoind")
+		rootDir := filepath.Join(viper.GetString(cli.HomeFlag), ".tlc")
 		db, err := dbm.NewGoLevelDB(KeyDBName, filepath.Join(rootDir, "data"))
 		if err != nil {
 			return nil, err
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index c0245ba86c..9bed2d3700 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -295,7 +295,7 @@ func TestTxs(t *testing.T) {
 // strt TM and the LCD in process, listening on their respective sockets
 func startTMAndLCD() (*nm.Node, net.Listener, error) {
 
-	viper.Set(cli.HomeFlag, os.ExpandEnv("/tmp/$HOME"))
+	viper.Set(cli.HomeFlag, os.TempDir())
 	kb, err := keys.GetKeyBase() // dbm.NewMemDB()) // :(
 	if err != nil {
 		return nil, nil, err