diff --git a/test/integration/component/test_acl_listsnapshot.py b/test/integration/component/test_acl_listsnapshot.py
index 36ec59ecb40..f0fa7b78106 100644
--- a/test/integration/component/test_acl_listsnapshot.py
+++ b/test/integration/component/test_acl_listsnapshot.py
@@ -360,8 +360,8 @@ class TestSnapshotList(cloudstackTestCase):
                             cls.service_offering,
                             ]
         except Exception as e:
-                cls.domain_1.delete(cls.apiclient,cleanup="true")
                 cls.domain_2.delete(cls.apiclient,cleanup="true")
+                cls.domain_1.delete(cls.apiclient,cleanup="true")
                 cleanup_resources(cls.apiclient, cls.cleanup)
                 raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
 
@@ -370,10 +370,11 @@ class TestSnapshotList(cloudstackTestCase):
         cls.apiclient = super(TestSnapshotList, cls).getClsTestClient().getApiClient()
         cls.apiclient.connection.apiKey = cls.default_apikey
         cls.apiclient.connection.securityKey = cls.default_secretkey
-        cls.domain_1.delete(cls.apiclient,cleanup="true")
-        cls.domain_2.delete(cls.apiclient,cleanup="true")
+        try:
+            cls.domain_2.delete(cls.apiclient,cleanup="true")
+            cls.domain_1.delete(cls.apiclient,cleanup="true")
+        except: pass
         cleanup_resources(cls.apiclient, cls.cleanup)
-        return
 
     def setUp(cls):
         cls.apiclient = cls.testClient.getApiClient()
diff --git a/test/integration/component/test_acl_listvm.py b/test/integration/component/test_acl_listvm.py
index de997183aa4..5ed937f2d4a 100644
--- a/test/integration/component/test_acl_listvm.py
+++ b/test/integration/component/test_acl_listvm.py
@@ -333,8 +333,8 @@ class TestVMList(cloudstackTestCase):
                             cls.service_offering,
                             ]
     	except Exception as e:
-        	cls.domain_1.delete(cls.apiclient,cleanup="true")
         	cls.domain_2.delete(cls.apiclient,cleanup="true")
+		cls.domain_1.delete(cls.apiclient,cleanup="true")
         	cleanup_resources(cls.apiclient, cls.cleanup)
 		raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
 
@@ -343,10 +343,11 @@ class TestVMList(cloudstackTestCase):
         cls.apiclient = super(TestVMList, cls).getClsTestClient().getApiClient()
         cls.apiclient.connection.apiKey = cls.default_apikey
         cls.apiclient.connection.securityKey = cls.default_secretkey
-        cls.domain_1.delete(cls.apiclient,cleanup="true")
-        cls.domain_2.delete(cls.apiclient,cleanup="true")
+        try:
+            cls.domain_2.delete(cls.apiclient,cleanup="true")
+            cls.domain_1.delete(cls.apiclient,cleanup="true")
+        except: pass
         cleanup_resources(cls.apiclient, cls.cleanup)
-        return
 
     def setUp(cls):
         cls.apiclient = cls.testClient.getApiClient()
diff --git a/test/integration/component/test_acl_listvolume.py b/test/integration/component/test_acl_listvolume.py
index 12e514d943a..05cabebf193 100644
--- a/test/integration/component/test_acl_listvolume.py
+++ b/test/integration/component/test_acl_listvolume.py
@@ -345,8 +345,8 @@ class TestVolumeList(cloudstackTestCase):
                             cls.service_offering,
                             ]
         except Exception as e:
-                cls.domain_1.delete(cls.apiclient,cleanup="true")
                 cls.domain_2.delete(cls.apiclient,cleanup="true")
+                cls.domain_1.delete(cls.apiclient,cleanup="true")
                 cleanup_resources(cls.apiclient, cls.cleanup)
                 raise Exception("Failed to create the setup required to execute the test cases: %s" % e)
 
@@ -358,9 +358,10 @@ class TestVolumeList(cloudstackTestCase):
         cls.apiclient.connection.apiKey = cls.default_apikey
         cls.apiclient.connection.securityKey = cls.default_secretkey
         cleanup_resources(cls.apiclient, cls.cleanup)
-        cls.domain_1.delete(cls.apiclient,cleanup="true")
-        cls.domain_2.delete(cls.apiclient,cleanup="true")
-        return
+        try:
+            cls.domain_2.delete(cls.apiclient,cleanup="true")
+            cls.domain_1.delete(cls.apiclient,cleanup="true")
+        except: pass
 
     def setUp(cls):
         cls.apiclient = cls.testClient.getApiClient()