diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index 33d859115ff..0355325b1c2 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -37,8 +37,6 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
         cls.services["zoneid"] = cls.zone.id
-        pod = get_pod(cls.apiclient, cls.zone.id)
-        cls.services["podid"] = pod.id
         # Create Account
         cls.account = Account.create(
                             cls.apiclient,
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index dc35f9cfba4..26f920ed02a 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -2428,7 +2428,8 @@ class PublicIpRange:
         cmd.startip = services["startip"]
         cmd.endip = services["endip"]
         cmd.zoneid = services["zoneid"]
-        cmd.podid = services["podid"]
+        if "podid" in services:
+            cmd.podid = services["podid"]
         cmd.vlan = services["vlan"]
 
         return PublicIpRange(apiclient.createVlanIpRange(cmd).__dict__)