diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 396c54ee7bd..8706a1e7058 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -1110,7 +1110,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
         self.cleanup = []
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns","test"])
     def test_01_RouterStopCreateFW(self):
         """Test router stop create Firewall rule
         """
@@ -1249,25 +1249,39 @@ class TestRouterStopCreateFW(cloudstackTestCase):
                         "Check for list hosts response return valid data"
                         )
         host = hosts[0]
+        host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
+
         # For DNS and DHCP check 'dnsmasq' process status
-        try:
-            host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
-            result = get_process_status(
-                host.ipaddress,
-                22,
-                host.user,
-                host.passwd,
-                router.linklocalip,
-                'iptables -t nat -L'
+        if self.apiclient.hypervisor.lower() == 'vmware':
+               result = get_process_status(
+                               self.apiclient.connection.mgtSvr,
+                               22,
+                               self.apiclient.connection.user,
+                               self.apiclient.connection.passwd,
+                               router.linklocalip,
+                               'iptables -t nat -L',
+                                hypervisor=self.apiclient.hypervisor
+                               )
+        else:
+            try:
+                result = get_process_status(
+                    host.ipaddress,
+                    22,
+                    host.user,
+                    host.passwd,
+                    router.linklocalip,
+                    'iptables -t nat -L'
+                )
+            except KeyError:
+                self.skipTest("Provide a marvin config file with host credentials to run %s" % self._testMethodName)
+
+        self.debug("iptables -t nat -L: %s" % result)
+        self.debug("Public IP: %s" % public_ip.ipaddress)
+        res = str(result)
+        self.assertEqual(
+            res.count(str(public_ip.ipaddress)),
+            1,
+            "Check public IP address"
             )
-            self.debug("iptables -t nat -L: %s" % result)
-            self.debug("Public IP: %s" % public_ip.ipaddress)
-            res = str(result)
-            self.assertEqual(
-                res.count(str(public_ip.ipaddress)),
-                1,
-                "Check public IP address"
-            )
-        except KeyError:
-            self.skipTest("Provide a marvin config file with host credentials to run %s" % self._testMethodName)
+
         return
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 02686664ded..0f32e274338 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -201,16 +201,17 @@ class TestRouterServices(cloudstackTestCase):
                                     router.linklocalip,
                                     "service dnsmasq status"
                                     )
-                res = str(result)
-                self.debug("Dnsmasq process status: %s" % res)
 
-                self.assertEqual(
-                                res.count("running"),
-                                1,
-                                "Check dnsmasq service is running or not"
-                        )
             except KeyError:
                 self.skipTest("Marvin configuration has no host credentials to check router services")
+        res = str(result)
+        self.debug("Dnsmasq process status: %s" % res)
+
+        self.assertEqual(
+            res.count("running"),
+            1,
+            "Check dnsmasq service is running or not"
+        )
         return