diff --git a/drivers/EXTSR.py b/drivers/EXTSR.py
index 61e88dcdc..d8ee60433 100755
--- a/drivers/EXTSR.py
+++ b/drivers/EXTSR.py
@@ -190,6 +190,7 @@ def create(self, sr_uuid, size):
                 size_mb = stats['freespace'] // (1024 * 1024)
             assert(size_mb > 0)
             cmd += ["-L", str(size_mb), self.vgname]
+            cmd += ["-W", "y", "--yes"]
             text = util.pread(cmd)
 
             cmd = ["lvchange", "-ay", self.remotepath]
diff --git a/drivers/lvutil.py b/drivers/lvutil.py
index 48767ead7..3de311621 100755
--- a/drivers/lvutil.py
+++ b/drivers/lvutil.py
@@ -599,7 +599,7 @@ def create(name, size, vgname, tag=None, size_in_percentage=None):
     if tag:
         cmd.extend(["--addtag", tag])
 
-    cmd.extend(['-W', 'n'])
+    cmd.extend(['-W', 'y', '--yes'])
     cmd_lvm(cmd)
 
 
diff --git a/scripts/storage-init b/scripts/storage-init
index 4619afac9..fc54ed9e4 100755
--- a/scripts/storage-init
+++ b/scripts/storage-init
@@ -50,8 +50,8 @@ diskprep() {
     done
 
     # erase the start of the volume to get rid of other metadata:
-    echo "* Erasing start of volume"
-    dd if=/dev/zero of=${disk} count=10 bs=1024k &>/dev/null
+    echo "* Erasing any filesystems on volume"
+    wipefs -a ${disk}
 
     echo "Complete."
 }
diff --git a/tests/lvmlib.py b/tests/lvmlib.py
index c57b32e05..0fbdeb245 100644
--- a/tests/lvmlib.py
+++ b/tests/lvmlib.py
@@ -79,6 +79,7 @@ def fake_lvcreate(self, args, stdin):
         parser.add_argument("--inactive", dest='inactive', action='store_true')
         parser.add_argument("--zero", dest='zero', default='y')
         parser.add_argument("-W", dest='wipe_sig')
+        parser.add_argument("--yes", dest='all_yes', action="store_true")
         parser.add_argument('vgname')
         try:
             args = parser.parse_args(args[1:])
diff --git a/tests/test_storage_init.py b/tests/test_storage_init.py
index 9b7138a4b..f4a776c96 100644
--- a/tests/test_storage_init.py
+++ b/tests/test_storage_init.py
@@ -89,6 +89,7 @@ def setUp(self):
         self.create_mock_command("xe")
 
         self.create_dummy_command("dd")
+        self.create_dummy_command("wipefs")
         self.create_dummy_command("logger")
         self.create_dummy_command("pvremove")
         self.create_dummy_command("pvs")