diff --git a/src/tests/kits/storage/BasicTest.cpp b/src/tests/kits/storage/BasicTest.cpp
index 8ab6c83ff6..95adf562b9 100644
--- a/src/tests/kits/storage/BasicTest.cpp
+++ b/src/tests/kits/storage/BasicTest.cpp
@@ -83,7 +83,8 @@ BasicTest::dumpStat(struct stat &st)
 
 // createVolume
 void
-BasicTest::createVolume(string imageFile, string mountPoint, int32 megs)
+BasicTest::createVolume(string imageFile, string mountPoint, int32 megs,
+						bool makeMountPoint)
 {
 	char megsString[16];
 	sprintf(megsString, "%ld", megs);
@@ -93,17 +94,18 @@ BasicTest::createVolume(string imageFile, string mountPoint, int32 megs)
 				+ " ; mkbfs " + imageFile
 					+ " > /dev/null"
 				+ " ; sync"
-				+ " ; mkdir " + mountPoint
+				+ (makeMountPoint ? " ; mkdir " + mountPoint : "")
 				+ " ; mount " + imageFile + " " + mountPoint);
 }
 
 // deleteVolume
 void
-BasicTest::deleteVolume(string imageFile, string mountPoint)
+BasicTest::deleteVolume(string imageFile, string mountPoint,
+						bool deleteMountPoint)
 {
 	execCommand(string("sync")
 				+ " ; unmount " + mountPoint
-				+ " ; rmdir " + mountPoint
+				+ (deleteMountPoint ? " ; rmdir " + mountPoint : "")
 				+ " ; rm " + imageFile);
 }
 
diff --git a/src/tests/kits/storage/BasicTest.h b/src/tests/kits/storage/BasicTest.h
index c783eba768..36758c05bd 100644
--- a/src/tests/kits/storage/BasicTest.h
+++ b/src/tests/kits/storage/BasicTest.h
@@ -29,8 +29,10 @@ public:
 
 	static void dumpStat(struct stat &st);
 
-	static void createVolume(string imageFile, string mountPoint, int32 megs);
-	static void deleteVolume(string imageFile, string mountPoint);
+	static void createVolume(string imageFile, string mountPoint, int32 megs,
+							 bool makeMountPoint = true);
+	static void deleteVolume(string imageFile, string mountPoint,
+							 bool deleteMountPoint = true);
 
 protected:	
 	int32 fSubTestNumber;