diff --git a/pengine/test10/remote-fence-before-reconnect.dot b/pengine/test10/remote-fence-before-reconnect.dot
index 2022b4cd79..ef2b047ef2 100644
--- a/pengine/test10/remote-fence-before-reconnect.dot
+++ b/pengine/test10/remote-fence-before-reconnect.dot
@@ -1,17 +1,18 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "c7auto4_stop_0 c7auto1" -> "all_stopped" [ style = bold]
 "c7auto4_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"]
 "fake2_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"]
 "fake2_start_0 c7auto1" -> "fake2_monitor_10000 c7auto1" [ style = bold]
 "fake2_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
 "fake2_stop_0 c7auto4" -> "all_stopped" [ style = bold]
+"fake2_stop_0 c7auto4" -> "c7auto4_stop_0 c7auto1" [ style = bold]
 "fake2_stop_0 c7auto4" -> "fake2_start_0 c7auto1" [ style = bold]
 "fake2_stop_0 c7auto4" [ style=bold color="green" fontcolor="orange"]
 "stonith 'reboot' c7auto4" -> "fake2_stop_0 c7auto4" [ style = bold]
 "stonith 'reboot' c7auto4" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' c7auto4" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "fake2_start_0 c7auto1" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/remote-fence-before-reconnect.exp b/pengine/test10/remote-fence-before-reconnect.exp
index 2c9ee6c073..54c910652d 100644
--- a/pengine/test10/remote-fence-before-reconnect.exp
+++ b/pengine/test10/remote-fence-before-reconnect.exp
@@ -1,96 +1,100 @@
 <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="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1">
         <primitive id="c7auto4" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000"  reconnect_interval="1m"/>
         <downed>
           <node id="c7auto4"/>
         </downed>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="fake2_monitor_10000" on_node="c7auto1" on_node_uuid="1">
         <primitive id="fake2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="14" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1">
         <primitive id="fake2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4">
         <attributes CRM_meta_on_node="c7auto4" CRM_meta_on_node_uuid="c7auto4" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="c7auto4"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
       <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary
index 5cd8dd960d..88ca48cfbf 100644
--- a/pengine/test10/remote-fence-before-reconnect.summary
+++ b/pengine/test10/remote-fence-before-reconnect.summary
@@ -1,38 +1,38 @@
 
 Current cluster status:
 RemoteNode c7auto4: UNCLEAN (offline)
 Online: [ c7auto1 c7auto2 c7auto3 ]
 
  shooter	(stonith:fence_phd_kvm):	Started c7auto2
  c7auto4	(ocf::pacemaker:remote):	FAILED c7auto1
  fake1	(ocf::heartbeat:Dummy):	Started c7auto3
  fake2	(ocf::heartbeat:Dummy):	Started c7auto4 (UNCLEAN)
  fake3	(ocf::heartbeat:Dummy):	Started c7auto1
  fake4	(ocf::heartbeat:Dummy):	Started c7auto2
  fake5	(ocf::heartbeat:Dummy):	Started c7auto3
 
 Transition Summary:
  * Stop    c7auto4	(c7auto1)
  * Move    fake2	(Started c7auto4 -> c7auto1)
 
 Executing cluster transition:
- * Resource action: c7auto4         stop on c7auto1
  * Fencing c7auto4 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   fake2_stop_0
- * Pseudo action:   all_stopped
+ * Resource action: c7auto4         stop on c7auto1
  * Resource action: fake2           start on c7auto1
+ * Pseudo action:   all_stopped
  * Resource action: fake2           monitor=10000 on c7auto1
 
 Revised cluster status:
 RemoteNode c7auto4: UNCLEAN (offline)
 Online: [ c7auto1 c7auto2 c7auto3 ]
 
  shooter	(stonith:fence_phd_kvm):	Started c7auto2
  c7auto4	(ocf::pacemaker:remote):	FAILED
  fake1	(ocf::heartbeat:Dummy):	Started c7auto3
  fake2	(ocf::heartbeat:Dummy):	Started c7auto1
  fake3	(ocf::heartbeat:Dummy):	Started c7auto1
  fake4	(ocf::heartbeat:Dummy):	Started c7auto2
  fake5	(ocf::heartbeat:Dummy):	Started c7auto3
 
diff --git a/pengine/test10/remote-fence-unclean.dot b/pengine/test10/remote-fence-unclean.dot
index e956a9135f..b2829a7c85 100644
--- a/pengine/test10/remote-fence-unclean.dot
+++ b/pengine/test10/remote-fence-unclean.dot
@@ -1,36 +1,37 @@
  digraph "g" {
 "FAKE2_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE2_start_0 18builder" -> "FAKE2_monitor_60000 18builder" [ style = bold]
 "FAKE2_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE2_stop_0 remote1" -> "FAKE2_start_0 18builder" [ style = bold]
 "FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold]
+"FAKE2_stop_0 remote1" -> "remote1_stop_0 18node1" [ style = bold]
 "FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="orange"]
 "FAKE3_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
 "FAKE3_start_0 18node1" -> "FAKE3_monitor_60000 18node1" [ style = bold]
 "FAKE3_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "FAKE3_stop_0 18builder" -> "FAKE3_start_0 18node1" [ style = bold]
 "FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold]
 "FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
 "FAKE4_start_0 18node2" -> "FAKE4_monitor_60000 18node2" [ style = bold]
 "FAKE4_start_0 18node2" [ style=bold color="green" fontcolor="black"]
 "FAKE4_stop_0 18node1" -> "FAKE4_start_0 18node2" [ style = bold]
 "FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold]
 "FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
 "remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold]
 "remote1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "remote1_stop_0 18node1" -> "all_stopped" [ style = bold]
 "remote1_stop_0 18node1" -> "remote1_start_0 18node1" [ style = bold]
 "remote1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' remote1" -> "FAKE2_stop_0 remote1" [ style = bold]
 "stonith 'reboot' remote1" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' remote1" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "FAKE2_start_0 18builder" [ style = bold]
 "stonith_complete" -> "FAKE3_start_0 18node1" [ style = bold]
 "stonith_complete" -> "FAKE4_start_0 18node2" [ style = bold]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "remote1_start_0 18node1" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/remote-fence-unclean.exp b/pengine/test10/remote-fence-unclean.exp
index 125366ef50..d2c361730a 100644
--- a/pengine/test10/remote-fence-unclean.exp
+++ b/pengine/test10/remote-fence-unclean.exp
@@ -1,207 +1,211 @@
 <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="10" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
         <downed>
           <node id="remote1"/>
         </downed>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="4" 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_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="10" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="14" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="18" operation="monitor" operation_key="FAKE3_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="17" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="17" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="FAKE4_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="20" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="20" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="12">
     <action_set>
       <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1">
         <attributes CRM_meta_on_node="remote1" CRM_meta_on_node_uuid="remote1" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="remote1"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
       <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
       <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
       <trigger>
         <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-fence-unclean.summary b/pengine/test10/remote-fence-unclean.summary
index 60e70a51e8..cd246e4c0a 100644
--- a/pengine/test10/remote-fence-unclean.summary
+++ b/pengine/test10/remote-fence-unclean.summary
@@ -1,46 +1,46 @@
 
 Current cluster status:
 RemoteNode remote1: UNCLEAN (offline)
 Online: [ 18builder 18node1 18node2 ]
 
  shooter	(stonith:fence_xvm):	Started 18builder 
  remote1	(ocf::pacemaker:remote):	FAILED 18node1 
  FAKE1	(ocf::heartbeat:Dummy):	Started 18node2 
  FAKE2	(ocf::heartbeat:Dummy):	Started remote1 (UNCLEAN)
  FAKE3	(ocf::heartbeat:Dummy):	Started 18builder 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1 
 
 Transition Summary:
  * Recover remote1	(Started 18node1)
  * Move    FAKE2	(Started remote1 -> 18builder)
  * Move    FAKE3	(Started 18builder -> 18node1)
  * Move    FAKE4	(Started 18node1 -> 18node2)
 
 Executing cluster transition:
- * Resource action: remote1         stop on 18node1
  * Resource action: FAKE3           stop on 18builder
  * Resource action: FAKE4           stop on 18node1
  * Fencing remote1 (reboot)
  * Pseudo action:   stonith_complete
- * Resource action: remote1         start on 18node1
- * Resource action: remote1         monitor=60000 on 18node1
  * Pseudo action:   FAKE2_stop_0
  * Resource action: FAKE3           start on 18node1
  * Resource action: FAKE4           start on 18node2
- * Pseudo action:   all_stopped
+ * Resource action: remote1         stop on 18node1
  * Resource action: FAKE2           start on 18builder
  * Resource action: FAKE3           monitor=60000 on 18node1
  * Resource action: FAKE4           monitor=60000 on 18node2
+ * Pseudo action:   all_stopped
+ * Resource action: remote1         start on 18node1
+ * Resource action: remote1         monitor=60000 on 18node1
  * Resource action: FAKE2           monitor=60000 on 18builder
 
 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 18builder 
  FAKE3	(ocf::heartbeat:Dummy):	Started 18node1 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node2 
 
diff --git a/pengine/test10/remote-recover-fail.dot b/pengine/test10/remote-recover-fail.dot
index a92008943e..7b6edaa413 100644
--- a/pengine/test10/remote-recover-fail.dot
+++ b/pengine/test10/remote-recover-fail.dot
@@ -1,36 +1,38 @@
  digraph "g" {
 "FAKE1_monitor_10000 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "FAKE1_start_0 rhel7-auto2" -> "FAKE1_monitor_10000 rhel7-auto2" [ style = bold]
 "FAKE1_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_10000 rhel7-auto3" [ style=bold color="green" fontcolor="black"]
 "FAKE2_start_0 rhel7-auto3" -> "FAKE2_monitor_10000 rhel7-auto3" [ style = bold]
 "FAKE2_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"]
 "FAKE2_stop_0 rhel7-auto4" -> "FAKE2_start_0 rhel7-auto3" [ style = bold]
 "FAKE2_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold]
+"FAKE2_stop_0 rhel7-auto4" -> "rhel7-auto4_stop_0 rhel7-auto2" [ style = bold]
 "FAKE2_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="orange"]
 "FAKE3_monitor_10000 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_10000 rhel7-auto3" [ style=bold color="green" fontcolor="black"]
 "FAKE6_monitor_10000 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "FAKE6_start_0 rhel7-auto2" -> "FAKE6_monitor_10000 rhel7-auto2" [ style = bold]
 "FAKE6_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "FAKE6_stop_0 rhel7-auto4" -> "FAKE6_start_0 rhel7-auto2" [ style = bold]
 "FAKE6_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold]
+"FAKE6_stop_0 rhel7-auto4" -> "rhel7-auto4_stop_0 rhel7-auto2" [ style = bold]
 "FAKE6_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="orange"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "rhel7-auto4_monitor_60000 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "rhel7-auto4_start_0 rhel7-auto2" -> "rhel7-auto4_monitor_60000 rhel7-auto2" [ style = bold]
 "rhel7-auto4_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "rhel7-auto4_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold]
 "rhel7-auto4_stop_0 rhel7-auto2" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold]
 "rhel7-auto4_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' rhel7-auto4" -> "FAKE2_stop_0 rhel7-auto4" [ style = bold]
 "stonith 'reboot' rhel7-auto4" -> "FAKE6_stop_0 rhel7-auto4" [ style = bold]
 "stonith 'reboot' rhel7-auto4" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' rhel7-auto4" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "FAKE1_start_0 rhel7-auto2" [ style = bold]
 "stonith_complete" -> "FAKE2_start_0 rhel7-auto3" [ style = bold]
 "stonith_complete" -> "FAKE6_start_0 rhel7-auto2" [ style = bold]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/remote-recover-fail.exp b/pengine/test10/remote-recover-fail.exp
index 1daa510a61..be45b88fe4 100644
--- a/pengine/test10/remote-recover-fail.exp
+++ b/pengine/test10/remote-recover-fail.exp
@@ -1,213 +1,220 @@
 <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="8" operation="monitor" operation_key="rhel7-auto4_monitor_60000" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="rhel7-auto4" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="7" operation="start" operation_key="rhel7-auto4_start_0" on_node="rhel7-auto2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="7" operation="start" operation_key="rhel7-auto4_start_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="rhel7-auto4" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="stop" operation_key="rhel7-auto4_stop_0" on_node="rhel7-auto2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="3" operation="stop" operation_key="rhel7-auto4_stop_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="rhel7-auto4" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000" />
         <downed>
           <node id="rhel7-auto4"/>
         </downed>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <pseudo_event id="11" operation="stop" operation_key="FAKE2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="22" operation="stop" operation_key="FAKE6_stop_0"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="FAKE1_monitor_10000" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="9" operation="start" operation_key="FAKE1_start_0" on_node="rhel7-auto2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="9" operation="start" operation_key="FAKE1_start_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="FAKE2_monitor_10000" on_node="rhel7-auto3" on_node_uuid="3">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="12" operation="start" operation_key="FAKE2_start_0" on_node="rhel7-auto3" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="12" operation="start" operation_key="FAKE2_start_0" on_node="rhel7-auto3" on_node_uuid="3">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-auto3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="11" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <pseudo_event id="11" operation="stop" operation_key="FAKE2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="26" operation="stonith" operation_key="stonith-rhel7-auto4-reboot" on_node="rhel7-auto4" on_node_uuid="rhel7-auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="FAKE3_monitor_10000" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="FAKE4_monitor_10000" on_node="rhel7-auto3" on_node_uuid="3">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="FAKE6_monitor_10000" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="FAKE6" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="23" operation="start" operation_key="FAKE6_start_0" on_node="rhel7-auto2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="23" operation="start" operation_key="FAKE6_start_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="FAKE6" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="22" operation="stop" operation_key="FAKE6_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <pseudo_event id="22" operation="stop" operation_key="FAKE6_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="26" operation="stonith" operation_key="stonith-rhel7-auto4-reboot" on_node="rhel7-auto4" on_node_uuid="rhel7-auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
       <crm_event id="26" operation="stonith" operation_key="stonith-rhel7-auto4-reboot" on_node="rhel7-auto4" on_node_uuid="rhel7-auto4">
         <attributes CRM_meta_on_node="rhel7-auto4" CRM_meta_on_node_uuid="rhel7-auto4" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="rhel7-auto4"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="14">
     <action_set>
       <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="26" operation="stonith" operation_key="stonith-rhel7-auto4-reboot" on_node="rhel7-auto4" on_node_uuid="rhel7-auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
       <pseudo_event id="4" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="stop" operation_key="rhel7-auto4_stop_0" on_node="rhel7-auto2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <pseudo_event id="11" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="22" operation="stop" operation_key="FAKE6_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-recover-fail.summary b/pengine/test10/remote-recover-fail.summary
index 85847455bd..5953e34592 100644
--- a/pengine/test10/remote-recover-fail.summary
+++ b/pengine/test10/remote-recover-fail.summary
@@ -1,53 +1,53 @@
 
 Current cluster status:
 RemoteNode rhel7-auto4: UNCLEAN (offline)
 Online: [ rhel7-auto2 rhel7-auto3 ]
 OFFLINE: [ rhel7-auto1 ]
 
  shooter	(stonith:fence_xvm):	Started rhel7-auto3 
  rhel7-auto4	(ocf::pacemaker:remote):	FAILED rhel7-auto2 
  FAKE1	(ocf::heartbeat:Dummy):	Stopped 
  FAKE2	(ocf::heartbeat:Dummy):	Started rhel7-auto4 (UNCLEAN)
  FAKE3	(ocf::heartbeat:Dummy):	Started rhel7-auto2 
  FAKE4	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE5	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE6	(ocf::heartbeat:Dummy):	Started rhel7-auto4 (UNCLEAN)
 
 Transition Summary:
  * Recover rhel7-auto4	(Started rhel7-auto2)
  * Start   FAKE1	(rhel7-auto2)
  * Move    FAKE2	(Started rhel7-auto4 -> rhel7-auto3)
  * Move    FAKE6	(Started rhel7-auto4 -> rhel7-auto2)
 
 Executing cluster transition:
- * Resource action: rhel7-auto4     stop on rhel7-auto2
  * Resource action: FAKE3           monitor=10000 on rhel7-auto2
  * Resource action: FAKE4           monitor=10000 on rhel7-auto3
  * Fencing rhel7-auto4 (reboot)
  * Pseudo action:   stonith_complete
- * Resource action: rhel7-auto4     start on rhel7-auto2
  * Resource action: FAKE1           start on rhel7-auto2
  * Pseudo action:   FAKE2_stop_0
  * Pseudo action:   FAKE6_stop_0
- * Pseudo action:   all_stopped
- * Resource action: rhel7-auto4     monitor=60000 on rhel7-auto2
+ * Resource action: rhel7-auto4     stop on rhel7-auto2
  * Resource action: FAKE1           monitor=10000 on rhel7-auto2
  * Resource action: FAKE2           start on rhel7-auto3
  * Resource action: FAKE6           start on rhel7-auto2
+ * Pseudo action:   all_stopped
+ * Resource action: rhel7-auto4     start on rhel7-auto2
  * Resource action: FAKE2           monitor=10000 on rhel7-auto3
  * Resource action: FAKE6           monitor=10000 on rhel7-auto2
+ * Resource action: rhel7-auto4     monitor=60000 on rhel7-auto2
 
 Revised cluster status:
 Online: [ rhel7-auto2 rhel7-auto3 ]
 OFFLINE: [ rhel7-auto1 ]
 RemoteOnline: [ rhel7-auto4 ]
 
  shooter	(stonith:fence_xvm):	Started rhel7-auto3 
  rhel7-auto4	(ocf::pacemaker:remote):	Started rhel7-auto2 
  FAKE1	(ocf::heartbeat:Dummy):	Started rhel7-auto2 
  FAKE2	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE3	(ocf::heartbeat:Dummy):	Started rhel7-auto2 
  FAKE4	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE5	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE6	(ocf::heartbeat:Dummy):	Started rhel7-auto2