diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
index de12f3b433ff..efa9510a8e1c 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -40,7 +40,6 @@
 import org.apache.cloudstack.storage.command.UploadStatusAnswer;
 import org.apache.cloudstack.storage.command.UploadStatusAnswer.UploadStatus;
 import org.apache.cloudstack.storage.command.UploadStatusCommand;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.AttachIsoCommand;
@@ -823,12 +822,7 @@ public Answer Delete(DeleteCommand cmd) {
         try {
             txn.start();
             MockVolumeVO template = _mockVolumeDao.findByStoragePathAndType(cmd.getData().getPath());
-            if (template == null) {
-                if(!((VolumeObjectTO)cmd.getData()).getName().startsWith("ROOT-")) {
-                    return new Answer(cmd, false, "can't find object to delete:" + cmd.getData()
-                                                                                      .getPath());
-                }
-            } else {
+            if (template != null) {
                 _mockVolumeDao.remove(template.getId());
             }
             txn.commit();
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 23aa16110121..3def05346a47 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -803,7 +803,6 @@ def test_11_destroy_vm_and_volumes(self):
             accountid=self.account.name,
             domainid=self.account.domainid,
             serviceofferingid=self.small_offering.id,
-            mode=self.services["mode"]
         )
         vol1 = Volume.create(
             self.apiclient,