diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 83357866ca7..302016569ab 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -99,6 +99,24 @@
                                     "name": "PS1"
                                 }
                             ]
+                        },
+                        {
+                            "clustername": "C1",
+                            "hypervisor": "simulator",
+                            "hosts": [
+                                {
+                                    "username": "root",
+                                    "url": "http://sim/c1/h0",
+                                    "password": "password"
+                                }
+                            ],
+                            "clustertype": "CloudManaged",
+                            "primaryStorages": [
+                                {
+                                    "url": "nfs://10.147.28.6:/export/home/sandbox/primary2",
+                                    "name": "PS2"
+                                }
+                            ]
                         }
                     ],
                     "gateway": "172.16.15.1"
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index 67532c78d0f..f1b304346af 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -16,7 +16,7 @@
 # under the License.
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering
+from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering, Host
 from marvin.integration.lib.common import get_zone, get_domain, get_template, cleanup_resources
 
 from nose.plugins.attrib import attr
@@ -76,6 +76,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             domainid=cls.domain.id
         )
         cls.services["account"] = cls.account.name
+        cls.hosts = Host.list(cls.apiclient, hypervisortype='Simulator')
         cls.cleanup = [
             cls.account
         ]
@@ -177,10 +178,12 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             "Running",
             msg="VM is not in Running state"
         )
+        vm1clusterid = filter(lambda c: c.id == vm1.hostid, self.hosts)[0].clusterid
+        vm2clusterid = filter(lambda c: c.id == vm2.hostid, self.hosts)[0].clusterid
         self.assertNotEqual(
-            vm1.hostid,
-            vm2.hostid,
-            msg="VMs meant to be dispersed are deployed on the same host"
+            vm1clusterid,
+            vm2clusterid,
+            msg="VMs (%s, %s) meant to be dispersed are deployed in the same cluster %s" % (vm1.id, vm2.id, vm1clusterid)
         )
 
     @attr(tags=["simulator", "advanced", "basic", "sg"])
@@ -236,10 +239,12 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             "Running",
             msg="VM is not in Running state"
         )
-        self.assertNotEqual(
-            vm1.hostid,
-            vm2.hostid,
-            msg="VMs meant to be concentrated are deployed on the different hosts"
+        vm1clusterid = filter(lambda c: c.id == vm1.hostid, self.hosts)[0].clusterid
+        vm2clusterid = filter(lambda c: c.id == vm2.hostid, self.hosts)[0].clusterid
+        self.assertEqual(
+            vm1clusterid,
+            vm2clusterid,
+            msg="VMs (%s, %s) meant to be concentrated are deployed on different clusters (%s, %s)" % (vm1.id, vm2.id, vm1clusterid, vm2clusterid)
         )
 
     @classmethod