diff --git a/pengine/test10/migrate-versioned.dot b/pengine/test10/migrate-versioned.dot
index 20e932a218..4dbf3f2311 100644
--- a/pengine/test10/migrate-versioned.dot
+++ b/pengine/test10/migrate-versioned.dot
@@ -1,10 +1,7 @@
 digraph "g" {
-"A_monitor_0 node2" -> "A_start_0 node2" [ style = bold]
-"A_monitor_0 node2" -> "A_stop_0 node1" [ style = bold]
-"A_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
 "A_start_0 node2" [ style=bold color="green" fontcolor="black"]
 "A_stop_0 node1" -> "A_start_0 node2" [ style = bold]
 "A_stop_0 node1" -> "all_stopped" [ style = bold]
 "A_stop_0 node1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/migrate-versioned.exp b/pengine/test10/migrate-versioned.exp
index 9f0cdb7035..fb39de0730 100644
--- a/pengine/test10/migrate-versioned.exp
+++ b/pengine/test10/migrate-versioned.exp
@@ -1,76 +1,52 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="4" operation="start" operation_key="A_start_0" on_node="node2" on_node_uuid="2">
+      <rsc_op id="3" operation="stop" operation_key="A_stop_0" on_node="node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
         <rsc_versioned_attrs>
-          <instance_attributes score="1" id="A-instance_attributes">
+          <instance_attributes score="2" id="A-instance_attributes">
             <rule score="INFINITY" id="A-instance_attributes-rule">
               <expression attribute="#ra-version" operation="eq" value="1.0" id="A-instance_attributes-rule-expression"/>
             </rule>
-            <nvpair name="fake" value="real" id="A-instance_attributes-fake"/>
+            <nvpair name="op_sleep" value="3" id="A-instance_attributes-op_sleep"/>
           </instance_attributes>
         </rsc_versioned_attrs>
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  op_sleep="1"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="A_monitor_0" on_node="node2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="3" operation="stop" operation_key="A_stop_0" on_node="node1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="3" operation="stop" operation_key="A_stop_0" on_node="node1" on_node_uuid="1">
+      <rsc_op id="2" operation="start" operation_key="A_start_0" on_node="node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
         <rsc_versioned_attrs>
-          <instance_attributes score="1" id="A-instance_attributes">
+          <instance_attributes score="2" id="A-instance_attributes">
             <rule score="INFINITY" id="A-instance_attributes-rule">
               <expression attribute="#ra-version" operation="eq" value="1.0" id="A-instance_attributes-rule-expression"/>
             </rule>
-            <nvpair name="fake" value="real" id="A-instance_attributes-fake"/>
+            <nvpair name="op_sleep" value="3" id="A-instance_attributes-op_sleep"/>
           </instance_attributes>
         </rsc_versioned_attrs>
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  op_sleep="1"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="A_monitor_0" on_node="node2" on_node_uuid="2"/>
+        <rsc_op id="3" operation="stop" operation_key="A_stop_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
-    <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="A_monitor_0" on_node="node2" on_node_uuid="2">
-        <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <rsc_versioned_attrs>
-          <instance_attributes score="1" id="A-instance_attributes">
-            <rule score="INFINITY" id="A-instance_attributes-rule">
-              <expression attribute="#ra-version" operation="eq" value="1.0" id="A-instance_attributes-rule-expression"/>
-            </rule>
-            <nvpair name="fake" value="real" id="A-instance_attributes-fake"/>
-          </instance_attributes>
-        </rsc_versioned_attrs>
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="3">
     <action_set>
       <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="stop" operation_key="A_stop_0" on_node="node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/migrate-versioned.summary b/pengine/test10/migrate-versioned.summary
index 7e20fc0a77..44fe25a5b1 100644
--- a/pengine/test10/migrate-versioned.summary
+++ b/pengine/test10/migrate-versioned.summary
@@ -1,20 +1,19 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  A	(ocf::pacemaker:Dummy):	Started node1
 
 Transition Summary:
  * Move    A	(Started node1 -> node2)
 
 Executing cluster transition:
- * Resource action: A               monitor on node2
  * Resource action: A               stop on node1
- * Pseudo action:   all_stopped
  * Resource action: A               start on node2
+ * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  A	(ocf::pacemaker:Dummy):	Started node2
 
diff --git a/pengine/test10/migrate-versioned.xml b/pengine/test10/migrate-versioned.xml
index d27e316754..36f132b9f3 100644
--- a/pengine/test10/migrate-versioned.xml
+++ b/pengine/test10/migrate-versioned.xml
@@ -1,45 +1,67 @@
-<cib crm_feature_set="3.0.11" validate-with="pacemaker-2.6" epoch="53" num_updates="3" admin_epoch="0" cib-last-written="Wed Aug  3 14:20:56 2016" update-origin="node1" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="1">
+<cib crm_feature_set="3.0.12" validate-with="pacemaker-2.7" epoch="53" num_updates="3" admin_epoch="0" cib-last-written="Wed Mar  1 22:16:05 2017" update-origin="node1" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-have-watchdog" name="have-watchdog" value="false"/>
-        <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.15-747e11e"/>
+        <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.16-a8a7aeb"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="lbcluster"/>
         <nvpair name="stonith-enabled" value="false" id="cib-bootstrap-options-stonith-enabled"/>
+        <nvpair name="no-quorum-policy" value="ignore" id="cib-bootstrap-options-no-quorum-policy"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1" uname="node1"/>
       <node id="2" uname="node2"/>
     </nodes>
     <resources>
       <primitive id="A" class="ocf" provider="pacemaker" type="Dummy">
-        <instance_attributes score="1" id="A-instance_attributes">
+        <instance_attributes score="2" id="A-instance_attributes">
           <rule score="INFINITY" id="A-instance_attributes-rule">
             <expression attribute="#ra-version" operation="eq" value="1.0" id="A-instance_attributes-rule-expression"/>
           </rule>
-          <nvpair name="fake" value="real" id="A-instance_attributes-fake"/>
+          <nvpair name="op_sleep" value="3" id="A-instance_attributes-op_sleep"/>
+        </instance_attributes>
+        <instance_attributes score="1" id="A-instance_attributes-0">
+          <nvpair name="op_sleep" value="1" id="A-instance_attributes-0-op_sleep"/>
         </instance_attributes>
         <meta_attributes id="A-meta_attributes">
           <nvpair name="allow-migrate" value="true" id="A-meta_attributes-allow-migrate"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="A-on-node2" rsc="A" score="INFINITY" node="node2"/>
     </constraints>
   </configuration>
   <status>
+    <node_state id="2" uname="node2" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
+      <transient_attributes id="2">
+        <instance_attributes id="status-2">
+          <nvpair id="status-2-shutdown" name="shutdown" value="0"/>
+        </instance_attributes>
+      </transient_attributes>
+      <lrm id="2">
+        <lrm_resources>
+          <lrm_resource id="A" type="Dummy" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="A_last_0" operation_key="A_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:40:7:90605130-fa5d-4c21-b297-343737787187" transition-magic="0:7;3:40:7:90605130-fa5d-4c21-b297-343737787187" on_node="node2" call-id="76" rc-code="7" op-status="0" interval="0" last-run="1488395766" last-rc-change="1488395766" exec-time="2024" queue-time="0" op-digest="9a00043ddd78ff0a12d859f143653d8c" ra-version="1.0" op-force-restart=" state  passwd  op_sleep  envfile " op-restart-digest="9a00043ddd78ff0a12d859f143653d8c" op-secure-params=" passwd " op-secure-digest="9a00043ddd78ff0a12d859f143653d8c"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
     <node_state id="1" uname="node1" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
+      <transient_attributes id="1">
+        <instance_attributes id="status-1">
+          <nvpair id="status-1-shutdown" name="shutdown" value="0"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="A" type="Dummy" class="ocf" provider="pacemaker">
-            <lrm_rsc_op id="A_last_0" operation_key="A_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.11" transition-key="4:13:0:b3ff8b54-a60d-4919-86b3-b3f843c041ce" transition-magic="0:0;4:13:0:b3ff8b54-a60d-4919-86b3-b3f843c041ce" on_node="node1" call-id="20" rc-code="0" op-status="0" interval="0" last-run="1470248456" last-rc-change="1470248456" exec-time="27" queue-time="0" op-digest="92c1fcfb8e1608efe499629fe54ebb87" op-force-restart=" state  passwd  op_sleep  envfile " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-secure-params=" passwd " op-secure-digest="92c1fcfb8e1608efe499629fe54ebb87"/>
+            <lrm_rsc_op id="A_last_0" operation_key="A_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="4:40:0:90605130-fa5d-4c21-b297-343737787187" transition-magic="0:0;4:40:0:90605130-fa5d-4c21-b297-343737787187" on_node="node1" call-id="68" rc-code="0" op-status="0" interval="0" last-run="1488395768" last-rc-change="1488395768" exec-time="2042" queue-time="0" op-digest="9a00043ddd78ff0a12d859f143653d8c" ra-version="1.0" op-force-restart=" state  passwd  op_sleep  envfile " op-restart-digest="9a00043ddd78ff0a12d859f143653d8c" op-secure-params=" passwd " op-secure-digest="9a00043ddd78ff0a12d859f143653d8c"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
-    <node_state id="2" uname="node2" in_ccm="true" crmd="online" join="member" crm-debug-origin="do_update_resource" expected="member"/>
   </status>
 </cib>