diff --git a/pengine/test10/resource-discovery.xml b/pengine/test10/resource-discovery.xml
index 8b517df783..1692cdb79c 100644
--- a/pengine/test10/resource-discovery.xml
+++ b/pengine/test10/resource-discovery.xml
@@ -1,143 +1,149 @@
 <cib admin_epoch="0" cib-last-written="Tue Sep  3 17:59:24 2013" crm_feature_set="3.0.7" dc-uuid="5" epoch="13" have-quorum="1" num_updates="0" update-client="crm_resource" update-origin="18builder" validate-with="pacemaker-next">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.10-ab50afe"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1" uname="18node1"/>
       <node id="2" uname="18node2"/>
       <node id="3" uname="18node3"/>
       <node id="4" uname="18node4"/>
     </nodes>
     <resources>
       <primitive class="stonith" id="shooter" type="fence_xvm">
         <instance_attributes id="shooter-instance_attributes"/>
         <operations>
           <op id="shooter-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <primitive class="ocf" id="remote1" provider="pacemaker" type="remote">
         <instance_attributes id="remote1-instance_attributes"/>
         <operations>
           <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
         <meta_attributes id="remote1-meta_attributes"/>
       </primitive>
       <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy">
         <instance_attributes id="FAKE1-instance_attributes"/>
         <meta_attributes id="FAKE1-meta_attributes"/>
         <operations>
           <op id="FAKE1-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <primitive class="ocf" id="FAKE2" provider="heartbeat" type="Dummy">
         <instance_attributes id="FAKE2-instance_attributes"/>
         <meta_attributes id="FAKE2-meta_attributes"/>
         <operations>
           <op id="FAKE2-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <primitive class="ocf" id="FAKE3" provider="heartbeat" type="Dummy">
         <instance_attributes id="FAKE3-instance_attributes"/>
         <operations>
           <op id="FAKE3-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <primitive class="ocf" id="FAKE4" provider="heartbeat" type="Dummy">
         <instance_attributes id="FAKE4-instance_attributes"/>
         <operations>
           <op id="FAKE4-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <primitive class="ocf" id="FAKE5" provider="heartbeat" type="Dummy">
         <instance_attributes id="FAKE5-instance_attributes"/>
         <operations>
           <op id="FAKE5-monitor-interval-60s" interval="60s" name="monitor"/>
         </operations>
       </primitive>
       <clone id="FAKECLONE1-clone">
         <primitive class="ocf" id="FAKECLONE1" provider="heartbeat" type="Dummy">
           <instance_attributes id="FAKECLONE1-instance_attributes"/>
           <operations>
             <op id="FAKECLONE1-monitor-interval-60s" interval="60s" name="monitor"/>
           </operations>
         </primitive>
       </clone>
       <clone id="FAKECLONE2-clone">
         <primitive class="ocf" id="FAKECLONE2" provider="heartbeat" type="Dummy">
           <instance_attributes id="FAKECLONE2-instance_attributes"/>
           <operations>
             <op id="FAKECLONE2-monitor-interval-60s" interval="60s" name="monitor"/>
           </operations>
         </primitive>
       </clone>
       <group id="FAKEGROUP">
         <primitive class="ocf" id="FAKE6" provider="heartbeat" type="Dummy">
           <instance_attributes id="FAKE6-instance_attributes"/>
           <operations>
             <op id="FAKE6-start-timeout-20" interval="0s" name="start" timeout="20"/>
             <op id="FAKE6-stop-timeout-20" interval="0s" name="stop" timeout="20"/>
             <op id="FAKE6-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
         </primitive>
         <primitive class="ocf" id="FAKE7" provider="heartbeat" type="Dummy">
           <instance_attributes id="FAKE7-instance_attributes"/>
           <operations>
             <op id="FAKE7-start-timeout-20" interval="0s" name="start" timeout="20"/>
             <op id="FAKE7-stop-timeout-20" interval="0s" name="stop" timeout="20"/>
             <op id="FAKE7-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
         </primitive>
       </group>
     </resources>
     <constraints>
       <rsc_location id="location-FAKE1-remote1" node="remote1" resource-discovery="never" rsc="FAKE1" score="-INFINITY"/>
       <rsc_location id="location-FAKE1-18node1" node="18node1" resource-discovery="never" rsc="FAKE1" score="-INFINITY"/>
       <rsc_location id="location-FAKE1-18node2" node="18node2" resource-discovery="never" rsc="FAKE1" score="-INFINITY"/>
-      <rsc_location id="location-FAKE1-18node3" node="18node3" resource-discovery="never" rsc="FAKE1" score="-INFINITY"/>
+
+      <rsc_location id="location-FAKE1-18node3" resource-discovery="never" rsc="FAKE1" >
+        <rule score="-INFINITY" id="vlan003-on-cluster-nodes-rule">
+            <expression attribute="#uname" operation="eq" value="18node3" id="vlan003-on-cluster-nodes-rule-expression"/>
+        </rule>
+      </rsc_location>
+
       <rsc_location id="location-FAKE2-18node1" node="18node1" resource-discovery="exclusive" rsc="FAKE2" score="10"/>
       <rsc_location id="location-FAKE2-18node2" node="18node2" resource-discovery="exclusive" rsc="FAKE2" score="100"/>
       <rsc_location id="location-FAKE3-18node3--INFINITY" node="18node3" resource-discovery="exclusive" rsc="FAKE3" score="INFINITY"/>
       <rsc_location id="location-FAKE4-1-18node3--INFINITY" node="18node4" resource-discovery="always" rsc="FAKE4" score="0"/>
       <rsc_location id="location-FAKE4-2-18node3--INFINITY" node="18node4" resource-discovery="never" rsc="FAKE4" score="0"/>
       <rsc_location id="location-FAKE4-3-18node3--INFINITY" node="18node4" resource-discovery="exclusive" rsc="FAKE4" score="0"/>
       <rsc_location id="location-FAKE5-18node3--INFINITY" node="18node4" resource-discovery="always" rsc="FAKE5" score="0"/>
       <rsc_location id="location-FAKECLONE1-remote--INFINITY" node="remote1" resource-discovery="exclusive" rsc="FAKECLONE1-clone" score="0"/>
       <rsc_location id="location-FAKECLONE1-18node1-INFINITY" node="18node1" resource-discovery="exclusive" rsc="FAKECLONE1-clone" score="0"/>
       <rsc_location id="location-FAKECLONE2-18node2--INFINITY" node="18node2" resource-discovery="never" rsc="FAKECLONE2-clone" score="0"/>
 
 
       <rsc_location id="location-FAKEGROUP-18node1" node="18node1" resource-discovery="exclusive" rsc="FAKEGROUP" score="0"/>
       <rsc_location id="location-FAKEGROUP-18node2" node="18node2" resource-discovery="exclusive" rsc="FAKEGROUP" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state crm-debug-origin="remote_init_cib_status" id="remote1" remote_node="true" uname="remote1">
       <lrm id="remote1">
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state crm-debug-origin="do_update_resource" crmd="online" expected="member" id="1" in_ccm="true" join="member" uname="18node1">
       <lrm id="1">
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state crm-debug-origin="do_update_resource" crmd="online" expected="member" id="2" in_ccm="true" join="member" uname="18node2">
       <lrm id="2">
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state crm-debug-origin="do_update_resource" crmd="online" expected="member" id="3" in_ccm="true" join="member" uname="18node3">
       <lrm id="3">
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state crm-debug-origin="do_update_resource" crmd="online" expected="member" id="4" in_ccm="true" join="member" uname="18node4"/>
     <lrm id="4">
       <lrm_resources/>
     </lrm>
   </status>
 </cib>