@@ -151,6 +151,11 @@ dir, err := ioutil.TempDir("", "tmpdb")
 	if err != nil {
 		panic(err)
 	}
+	defer func() {
+		if err := os.RemoveAll(dir); err != nil {
+			panic(err)
+		}
+	}()
 	sdb, err := statedb.NewStateDB(dir, statedb.TypeTxSelector, 0)
 	if err != nil {
 		panic(err)

@@ -2,6 +2,7 @@ package batchbuilder
 
 import (
 	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/hermeznetwork/hermez-node/db/statedb"
@@ -12,12 +13,14 @@
 func TestBatchBuilder(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	synchDB, err := statedb.NewStateDB(dir, statedb.TypeBatchBuilder, 0)
 	assert.Nil(t, err)
 
 	bbDir, err := ioutil.TempDir("", "tmpBatchBuilderDB")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(bbDir))
 	_, err = NewBatchBuilder(bbDir, synchDB, nil, 0, 32)
 	assert.Nil(t, err)
 }

@@ -25,6 +25,7 @@ nLevels := 32
 
 	synchDBPath, err := ioutil.TempDir("", "tmpSynchDB")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(synchDBPath))
 	synchSdb, err := statedb.NewStateDB(synchDBPath, statedb.TypeSynchronizer, nLevels)
 	assert.Nil(t, err)
 
@@ -44,11 +45,13 @@ l2DB := l2db.NewL2DB(db, 10, 100, 24*time.Hour)
 
 	txselDir, err := ioutil.TempDir("", "tmpTxSelDB")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(txselDir))
 	txsel, err := txselector.NewTxSelector(txselDir, synchSdb, l2DB, 10, 10, 10)
 	assert.Nil(t, err)
 
 	bbDir, err := ioutil.TempDir("", "tmpBatchBuilderDB")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(bbDir))
 	bb, err := batchbuilder.NewBatchBuilder(bbDir, synchSdb, nil, 0, uint64(nLevels))
 	assert.Nil(t, err)
 

@@ -5,6 +5,7 @@ "encoding/hex"
 	"fmt"
 	"io/ioutil"
 	"math/big"
+	"os"
 	"testing"
 
 	ethCrypto "github.com/ethereum/go-ethereum/crypto"
@@ -37,6 +38,7 @@
 func TestNewStateDBIntermediateState(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeTxSelector, 0)
 	assert.Nil(t, err)
@@ -118,6 +120,7 @@
 func TestStateDBWithoutMT(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeTxSelector, 0)
 	assert.Nil(t, err)
@@ -171,6 +174,7 @@
 func TestStateDBWithMT(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeSynchronizer, 32)
 	assert.Nil(t, err)
@@ -222,6 +226,7 @@
 func TestCheckpoints(t *testing.T) {
 	dir, err := ioutil.TempDir("", "sdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeSynchronizer, 32)
 	assert.Nil(t, err)
@@ -289,6 +294,7 @@
 	// Create a LocalStateDB from the initial StateDB
 	dirLocal, err := ioutil.TempDir("", "ldb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dirLocal))
 	ldb, err := NewLocalStateDB(dirLocal, sdb, TypeBatchBuilder, 32)
 	assert.Nil(t, err)
 
@@ -309,6 +315,7 @@
 	// Create a 2nd LocalStateDB from the initial StateDB
 	dirLocal2, err := ioutil.TempDir("", "ldb2")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dirLocal2))
 	ldb2, err := NewLocalStateDB(dirLocal2, sdb, TypeBatchBuilder, 32)
 	assert.Nil(t, err)
 

@@ -2,6 +2,7 @@ package statedb
 
 import (
 	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/hermeznetwork/hermez-node/common"
@@ -16,6 +17,7 @@ // the Synchronizer tests
 
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeSynchronizer, 32)
 	assert.Nil(t, err)
@@ -72,6 +74,7 @@
 func TestProcessTxsBatchBuilder(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeBatchBuilder, 32)
 	assert.Nil(t, err)
@@ -121,6 +124,7 @@
 func TestZKInputsGeneration(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeBatchBuilder, 32)
 	assert.Nil(t, err)

@@ -3,6 +3,7 @@
 import (
 	"io/ioutil"
 	"math/big"
+	"os"
 	"testing"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
@@ -15,6 +16,7 @@
 func TestGetIdx(t *testing.T) {
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	sdb, err := NewStateDB(dir, TypeTxSelector, 0)
 	assert.Nil(t, err)

@@ -115,6 +115,11 @@ dir, err := ioutil.TempDir("", "tmpks")
 		if err != nil {
 			panic(err)
 		}
+		defer func() {
+			if err := os.RemoveAll(dir); err != nil {
+				panic(err)
+			}
+		}()
 		ks = keystore.NewKeyStore(dir, keystore.LightScryptN, keystore.LightScryptP)
 
 		// Load ethereum accounts from private keys

@@ -29,6 +29,7 @@ func TestSync(t *testing.T) {
 	// Int State DB
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 
 	stateDB, err := statedb.NewStateDB(dir, statedb.TypeSynchronizer, 32)
 	assert.Nil(t, err)

@@ -10,11 +10,13 @@ l2DB := l2db.NewL2DB(db, 10, 100, 24*time.Hour)
 
 	dir, err := ioutil.TempDir("", "tmpdb")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 	sdb, err := statedb.NewStateDB(dir, statedb.TypeTxSelector, 0)
 	require.Nil(t, err)
 
 	txselDir, err := ioutil.TempDir("", "tmpTxSelDB")
 	require.Nil(t, err)
+	defer assert.Nil(t, os.RemoveAll(dir))
 	txsel, err := NewTxSelector(txselDir, sdb, l2DB, maxL1UserTxs, maxL1OperatorTxs, maxTxs)
 	require.Nil(t, err)