diff --git a/keystore/keystore_test.go b/keystore/keystore_test.go
index f0c1b3105448..dd85c15b173d 100644
--- a/keystore/keystore_test.go
+++ b/keystore/keystore_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"math/rand"
+	"os"
 	"path/filepath"
 	"sort"
 	"testing"
@@ -146,6 +147,7 @@ func TestKeystoreBasics(t *testing.T) {
 
 func TestInvalidKeyFiles(t *testing.T) {
 	tdir, err := ioutil.TempDir("", "keystore-test")
+	defer os.RemoveAll(tdir)
 
 	if err != nil {
 		t.Fatal(err)