diff --git a/src/runtime/virtcontainers/persist/fs/fs_test.go b/src/runtime/virtcontainers/persist/fs/fs_test.go
index 91af4af159..370b87c527 100644
--- a/src/runtime/virtcontainers/persist/fs/fs_test.go
+++ b/src/runtime/virtcontainers/persist/fs/fs_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func getFsDriver() (*FS, error) {
-	driver, err := MockFSInit()
+func getFsDriver(t *testing.T) (*FS, error) {
+	driver, err := MockFSInit(t.TempDir())
 	if err != nil {
 		return nil, fmt.Errorf("failed to init fs driver")
 	}
@@ -27,16 +27,8 @@ func getFsDriver() (*FS, error) {
 	return fs.FS, nil
 }
 
-func initTestDir() func() {
-	return func() {
-		os.RemoveAll(MockStorageRootPath())
-	}
-}
-
 func TestFsLockShared(t *testing.T) {
-	defer initTestDir()()
-
-	fs, err := getFsDriver()
+	fs, err := getFsDriver(t)
 	assert.Nil(t, err)
 	assert.NotNil(t, fs)
 
@@ -61,9 +53,7 @@ func TestFsLockShared(t *testing.T) {
 }
 
 func TestFsLockExclusive(t *testing.T) {
-	defer initTestDir()()
-
-	fs, err := getFsDriver()
+	fs, err := getFsDriver(t)
 	assert.Nil(t, err)
 	assert.NotNil(t, fs)
 
@@ -89,9 +79,7 @@ func TestFsLockExclusive(t *testing.T) {
 }
 
 func TestFsDriver(t *testing.T) {
-	defer initTestDir()()
-
-	fs, err := getFsDriver()
+	fs, err := getFsDriver(t)
 	assert.Nil(t, err)
 	assert.NotNil(t, fs)
 
@@ -162,12 +150,10 @@ func TestFsDriver(t *testing.T) {
 }
 
 func TestGlobalReadWrite(t *testing.T) {
-	defer initTestDir()()
-
 	relPath := "test/123/aaa.json"
 	data := "hello this is testing global read write"
 
-	fs, err := getFsDriver()
+	fs, err := getFsDriver(t)
 	assert.Nil(t, err)
 	assert.NotNil(t, fs)
 
diff --git a/src/runtime/virtcontainers/persist/fs/mockfs.go b/src/runtime/virtcontainers/persist/fs/mockfs.go
index 4c4f492693..dca4acad42 100644
--- a/src/runtime/virtcontainers/persist/fs/mockfs.go
+++ b/src/runtime/virtcontainers/persist/fs/mockfs.go
@@ -36,7 +36,7 @@ func MockRunVMStoragePath() string {
 	return filepath.Join(MockStorageRootPath(), vmPathSuffix)
 }
 
-func MockFSInit() (persistapi.PersistDriver, error) {
+func MockFSInit(rootPath string) (persistapi.PersistDriver, error) {
 	driver, err := Init()
 	if err != nil {
 		return nil, fmt.Errorf("Could not create Mock FS driver: %v", err)
@@ -47,7 +47,7 @@ func MockFSInit() (persistapi.PersistDriver, error) {
 		return nil, fmt.Errorf("Could not create Mock FS driver")
 	}
 
-	fsDriver.storageRootPath = MockStorageRootPath()
+	fsDriver.storageRootPath = rootPath
 	fsDriver.driverName = "mockfs"
 
 	return &MockFS{fsDriver}, nil
@@ -55,7 +55,7 @@ func MockFSInit() (persistapi.PersistDriver, error) {
 
 func MockAutoInit() (persistapi.PersistDriver, error) {
 	if mockTesting {
-		return MockFSInit()
+		return MockFSInit(MockStorageRootPath())
 	}
 	return nil, nil
 }
diff --git a/src/runtime/virtcontainers/persist/fs/mockfs_test.go b/src/runtime/virtcontainers/persist/fs/mockfs_test.go
index 99709a78e6..9cd5832895 100644
--- a/src/runtime/virtcontainers/persist/fs/mockfs_test.go
+++ b/src/runtime/virtcontainers/persist/fs/mockfs_test.go
@@ -28,7 +28,7 @@ func TestMockAutoInit(t *testing.T) {
 	mockTesting = true
 	fsd, err = MockAutoInit()
 	assert.NoError(err)
-	expectedFS, err := MockFSInit()
+	expectedFS, err := MockFSInit(MockStorageRootPath())
 	assert.NoError(err)
 	assert.Equal(expectedFS, fsd)
 }