diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 23c5786b37b..22d424f86cc 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -218,7 +218,7 @@ class TestISO(cloudstackTestCase):
         cls.services["account"] = cls.account.account.name
         # Finding the OsTypeId from Ostype
         ostypes = list_os_types(
-                    cls.apiclient,
+                    cls.api_client,
                     description=self.services["ostype"]
                     )
         if not isinstance(ostypes, list):
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 044c9108307..149a47c0663 100644
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -1039,7 +1039,8 @@ class ServiceOffering:
         cmd.displaytext = services["displaytext"]
         cmd.memory = services["memory"]
         cmd.name = services["name"]
-        cmd.storagetype = services["storagetype"]
+        if hasattr(cmd, "storagetype"):
+            cmd.storagetype = services["storagetype"]
 
         # Service Offering private to that domain
         if domainid:
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
index 05c6a1ac6bb..cc9e6cb09f0 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -64,6 +64,7 @@ def get_domain(apiclient, services=None):
     domains = apiclient.listDomains(cmd)
 
     if isinstance(domains, list):
+        assert len(domains) > 0
         return domains[0]
     else:
         raise Exception("Failed to find specified domain.")
@@ -80,6 +81,7 @@ def get_zone(apiclient, services=None):
     zones = apiclient.listZones(cmd)
 
     if isinstance(zones, list):
+        assert len(zones) > 0
         return zones[0]
     else:
         raise Exception("Failed to find specified zone.")
@@ -98,6 +100,7 @@ def get_pod(apiclient, zoneid, services=None):
     pods = apiclient.listPods(cmd)
 
     if isinstance(pods, list):
+        assert len(pods) > 0
         return pods[0]
     else:
         raise Exception("Exception: Failed to find specified pod.")