diff --git a/pengine/test10/remote-move.dot b/pengine/test10/remote-move.dot
index 8cef9d8bf4..e5d62e7338 100644
--- a/pengine/test10/remote-move.dot
+++ b/pengine/test10/remote-move.dot
@@ -1,24 +1,20 @@
  digraph "g" {
-"FAKE2_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKE2_start_0 remote1" -> "FAKE2_monitor_60000 remote1" [ style = bold]
-"FAKE2_start_0 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKE2_stop_0 remote1" -> "FAKE2_start_0 remote1" [ style = bold]
-"FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold]
-"FAKE2_stop_0 remote1" -> "remote1_stop_0 18builder" [ style = bold]
-"FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"remote1_migrate_from_0 18node1" -> "remote1_start_0 18node1" [ style = bold]
+"remote1_migrate_from_0 18node1" -> "remote1_stop_0 18builder" [ style = bold]
+"remote1_migrate_from_0 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_migrate_to_0 18builder" -> "remote1_migrate_from_0 18node1" [ style = bold]
+"remote1_migrate_to_0 18builder" [ style=bold color="green" fontcolor="black"]
 "remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
-"remote1_start_0 18node1" -> "FAKE2_monitor_60000 remote1" [ style = bold]
-"remote1_start_0 18node1" -> "FAKE2_start_0 remote1" [ style = bold]
 "remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold]
-"remote1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_start_0 18node1" [ style=bold color="green" fontcolor="orange"]
 "remote1_stop_0 18builder" -> "all_stopped" [ style = bold]
 "remote1_stop_0 18builder" -> "remote1_start_0 18node1" [ style = bold]
 "remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
 "shooter_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
 "shooter_start_0 18builder" -> "shooter_monitor_60000 18builder" [ style = bold]
 "shooter_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "shooter_stop_0 18node1" -> "all_stopped" [ style = bold]
 "shooter_stop_0 18node1" -> "shooter_start_0 18builder" [ style = bold]
 "shooter_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/remote-move.exp b/pengine/test10/remote-move.exp
index 4458362507..6724679e93 100644
--- a/pengine/test10/remote-move.exp
+++ b/pengine/test10/remote-move.exp
@@ -1,135 +1,115 @@
 <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="16" operation="monitor" operation_key="shooter_monitor_60000" on_node="18builder" on_node_uuid="5">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="15" operation="start" operation_key="shooter_start_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="15" operation="start" operation_key="shooter_start_0" on_node="18builder" on_node_uuid="5">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="stop" operation_key="shooter_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="14" operation="stop" operation_key="shooter_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="remote1_monitor_60000" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18builder" CRM_meta_migrate_target="18node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="20" operation="migrate_to" operation_key="remote1_migrate_to_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="20" operation="migrate_to" operation_key="remote1_migrate_to_0" on_node="18builder" on_node_uuid="5">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18builder" CRM_meta_migrate_target="18node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="19" operation="monitor" operation_key="remote1_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+        <pseudo_event id="18" operation="start" operation_key="remote1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="23" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18node1">
-        <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+      <pseudo_event id="18" operation="start" operation_key="remote1_start_0">
         <attributes CRM_meta_timeout="20000" />
-      </rsc_op>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+        <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
-        <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+      <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5">
+        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="8">
-    <action_set>
-      <rsc_op id="6" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="remote1" on_node_uuid="remote1" router_node="18node1">
-        <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="23" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18node1"/>
+        <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="9">
+  <synapse id="8">
     <action_set>
       <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="stop" operation_key="shooter_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
-      <trigger>
-        <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
-      </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-move.summary b/pengine/test10/remote-move.summary
index 4f8b5c2578..de223fd0be 100644
--- a/pengine/test10/remote-move.summary
+++ b/pengine/test10/remote-move.summary
@@ -1,40 +1,38 @@
 
 Current cluster status:
 Online: [ 18builder 18node1 18node2 ]
 RemoteOnline: [ remote1 ]
 
  shooter	(stonith:fence_xvm):	Started 18node1 
  remote1	(ocf::pacemaker:remote):	Started 18builder 
  FAKE1	(ocf::heartbeat:Dummy):	Started 18node2 
  FAKE2	(ocf::heartbeat:Dummy):	Started remote1 
  FAKE3	(ocf::heartbeat:Dummy):	Started 18builder 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1 
 
 Transition Summary:
  * Move    shooter	(Started 18node1 -> 18builder)
- * Move    remote1	(Started 18builder -> 18node1)
- * Restart FAKE2	(Started remote1)
+ * Migrate remote1	(Started 18builder -> 18node1)
 
 Executing cluster transition:
  * Resource action: shooter         stop on 18node1
- * Resource action: FAKE2           stop on remote1
+ * Resource action: remote1         migrate_to on 18builder
  * Resource action: shooter         start on 18builder
+ * Resource action: remote1         migrate_from on 18node1
  * Resource action: remote1         stop on 18builder
  * Pseudo action:   all_stopped
  * Resource action: shooter         monitor=60000 on 18builder
- * Resource action: remote1         start on 18node1
- * Resource action: FAKE2           start on remote1
- * Resource action: FAKE2           monitor=60000 on remote1
+ * Pseudo action:   remote1_start_0
  * Resource action: remote1         monitor=60000 on 18node1
 
 Revised cluster status:
 Online: [ 18builder 18node1 18node2 ]
 RemoteOnline: [ remote1 ]
 
  shooter	(stonith:fence_xvm):	Started 18builder 
  remote1	(ocf::pacemaker:remote):	Started 18node1 
  FAKE1	(ocf::heartbeat:Dummy):	Started 18node2 
  FAKE2	(ocf::heartbeat:Dummy):	Started remote1 
  FAKE3	(ocf::heartbeat:Dummy):	Started 18builder 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1