diff --git a/pkg/volume/flocker/flocker_util_test.go b/pkg/volume/flocker/flocker_util_test.go
index d10c1c148d2..c47ca006715 100644
--- a/pkg/volume/flocker/flocker_util_test.go
+++ b/pkg/volume/flocker/flocker_util_test.go
@@ -18,6 +18,7 @@ package flocker
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/v1"
@@ -38,7 +39,9 @@ func TestFlockerUtil_CreateVolume(t *testing.T) {
 	}
 
 	fakeFlockerClient := newFakeFlockerClient()
-	provisioner := newTestableProvisioner(assert, options).(*flockerVolumeProvisioner)
+	dir, p := newTestableProvisioner(assert, options)
+	provisioner := p.(*flockerVolumeProvisioner)
+	defer os.RemoveAll(dir)
 	provisioner.flockerClient = fakeFlockerClient
 
 	flockerUtil := &FlockerUtil{}
diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go
index 2e7d9a69628..172d75ee869 100644
--- a/pkg/volume/flocker/flocker_volume_test.go
+++ b/pkg/volume/flocker/flocker_volume_test.go
@@ -18,6 +18,7 @@ package flocker
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/v1"
@@ -29,7 +30,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOptions) volume.Provisioner {
+func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOptions) (string, volume.Provisioner) {
 	tmpDir, err := utiltesting.MkTmpdir("flockervolumeTest")
 	assert.NoError(err, fmt.Sprintf("can't make a temp dir: %v", err))
 
@@ -41,7 +42,7 @@ func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOpti
 
 	provisioner, err := plug.(*flockerPlugin).newProvisionerInternal(options, &fakeFlockerUtil{})
 
-	return provisioner
+	return tmpDir, provisioner
 }
 
 func TestProvision(t *testing.T) {
@@ -53,7 +54,8 @@ func TestProvision(t *testing.T) {
 		PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
 	}
 
-	provisioner := newTestableProvisioner(assert, options)
+	dir, provisioner := newTestableProvisioner(assert, options)
+	defer os.RemoveAll(dir)
 
 	persistentSpec, err := provisioner.Provision()
 	assert.NoError(err, "Provision() failed: ", err)
@@ -81,7 +83,8 @@ func TestProvision(t *testing.T) {
 		},
 	}
 
-	provisioner = newTestableProvisioner(assert, options)
+	dir, provisioner = newTestableProvisioner(assert, options)
+	defer os.RemoveAll(dir)
 	persistentSpec, err = provisioner.Provision()
 	assert.Error(err, "Provision() did not fail with Parameters specified")
 
@@ -92,8 +95,8 @@ func TestProvision(t *testing.T) {
 		PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
 	}
 
-	provisioner = newTestableProvisioner(assert, options)
+	dir, provisioner = newTestableProvisioner(assert, options)
+	defer os.RemoveAll(dir)
 	persistentSpec, err = provisioner.Provision()
 	assert.Error(err, "Provision() did not fail with Selector specified")
-
 }