diff --git a/src/runtime/virtcontainers/mount_test.go b/src/runtime/virtcontainers/mount_test.go
index b658de829..056fa2c14 100644
--- a/src/runtime/virtcontainers/mount_test.go
+++ b/src/runtime/virtcontainers/mount_test.go
@@ -381,6 +381,12 @@ func TestBindMountFailingMount(t *testing.T) {
 	assert.Error(err)
 }
 
+func cleanupFooMount() {
+	dest := filepath.Join(testDir, "fooDirDest")
+
+	syscall.Unmount(dest, 0)
+}
+
 func TestBindMountSuccessful(t *testing.T) {
 	assert := assert.New(t)
 	if tc.NotValid(ktu.NeedRoot()) {
@@ -389,9 +395,7 @@ func TestBindMountSuccessful(t *testing.T) {
 
 	source := filepath.Join(testDir, "fooDirSrc")
 	dest := filepath.Join(testDir, "fooDirDest")
-	syscall.Unmount(dest, 0)
-	os.Remove(source)
-	os.Remove(dest)
+	t.Cleanup(cleanupFooMount)
 
 	err := os.MkdirAll(source, mountPerm)
 	assert.NoError(err)
@@ -401,8 +405,6 @@ func TestBindMountSuccessful(t *testing.T) {
 
 	err = bindMount(context.Background(), source, dest, false, "private")
 	assert.NoError(err)
-
-	syscall.Unmount(dest, 0)
 }
 
 func TestBindMountReadonlySuccessful(t *testing.T) {
@@ -413,9 +415,7 @@ func TestBindMountReadonlySuccessful(t *testing.T) {
 
 	source := filepath.Join(testDir, "fooDirSrc")
 	dest := filepath.Join(testDir, "fooDirDest")
-	syscall.Unmount(dest, 0)
-	os.Remove(source)
-	os.Remove(dest)
+	t.Cleanup(cleanupFooMount)
 
 	err := os.MkdirAll(source, mountPerm)
 	assert.NoError(err)
@@ -426,8 +426,6 @@ func TestBindMountReadonlySuccessful(t *testing.T) {
 	err = bindMount(context.Background(), source, dest, true, "private")
 	assert.NoError(err)
 
-	defer syscall.Unmount(dest, 0)
-
 	// should not be able to create file in read-only mount
 	destFile := filepath.Join(dest, "foo")
 	_, err = os.OpenFile(destFile, os.O_CREATE, mountPerm)
@@ -442,9 +440,7 @@ func TestBindMountInvalidPgtypes(t *testing.T) {
 
 	source := filepath.Join(testDir, "fooDirSrc")
 	dest := filepath.Join(testDir, "fooDirDest")
-	syscall.Unmount(dest, 0)
-	os.Remove(source)
-	os.Remove(dest)
+	t.Cleanup(cleanupFooMount)
 
 	err := os.MkdirAll(source, mountPerm)
 	assert.NoError(err)