diff --git a/test/e2e/storage/detach_mounted.go b/test/e2e/storage/detach_mounted.go
index 5c944b541fb..4ee571e8cfb 100644
--- a/test/e2e/storage/detach_mounted.go
+++ b/test/e2e/storage/detach_mounted.go
@@ -64,7 +64,7 @@ var _ = utils.SIGDescribe("Detaching volumes", func() {
 	})
 
 	It("should not work when mount is in progress", func() {
-		driver := "attachable-with-long-format"
+		driver := "attachable-with-long-mount"
 		driverInstallAs := driver + "-" + suffix
 
 		By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driverInstallAs))
diff --git a/test/e2e/testing-manifests/flexvolume/attachable-with-long-format b/test/e2e/testing-manifests/flexvolume/attachable-with-long-mount
similarity index 100%
rename from test/e2e/testing-manifests/flexvolume/attachable-with-long-format
rename to test/e2e/testing-manifests/flexvolume/attachable-with-long-mount
diff --git a/test/e2e/testing-manifests/flexvolume/dummy-attachable b/test/e2e/testing-manifests/flexvolume/dummy-attachable
index 2c47faaf3fe..ed9e73e7a01 100755
--- a/test/e2e/testing-manifests/flexvolume/dummy-attachable
+++ b/test/e2e/testing-manifests/flexvolume/dummy-attachable
@@ -81,8 +81,6 @@ domountdevice() {
 
 unmountdevice() {
 	debug "unmountdevice $@"
-	MNTDEVICE=$2
-	validateMountDeviceOrDie "$MNTDEVICE" "unmountdevice"
 	MNTPATH=$1
 	rm "${MNTPATH}/index.html" >/dev/null 2>&1
 	umount ${MNTPATH} >/dev/null 2>&1