diff --git a/pengine/test10/stonith-4.dot b/pengine/test10/stonith-4.dot
index 7a71c1ee6f..3321254f68 100644
--- a/pengine/test10/stonith-4.dot
+++ b/pengine/test10/stonith-4.dot
@@ -1,34 +1,38 @@
 digraph "g" {
 "Fencing_monitor_0 pcmk-1" -> "probe_complete pcmk-1" [ style = bold]
 "Fencing_monitor_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "Fencing_monitor_0 pcmk-2" -> "probe_complete pcmk-2" [ style = dashed]
 "Fencing_monitor_0 pcmk-2" [ style=dashed color="red" fontcolor="black"]
 "Fencing_monitor_0 pcmk-3" -> "probe_complete pcmk-3" [ style = dashed]
 "Fencing_monitor_0 pcmk-3" [ style=dashed color="red" fontcolor="black"]
 "Fencing_start_0 pcmk-1" -> "stonith_up" [ style = bold]
 "Fencing_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "probe_complete pcmk-1" -> "probe_complete" [ style = dashed]
 "probe_complete pcmk-1" [ style=bold color="green" fontcolor="black"]
 "probe_complete pcmk-2" -> "probe_complete" [ style = dashed]
 "probe_complete pcmk-2" [ style=dashed color="red" fontcolor="black"]
 "probe_complete pcmk-3" -> "probe_complete" [ style = dashed]
 "probe_complete pcmk-3" [ style=dashed color="red" fontcolor="black"]
 "probe_complete" -> "Fencing_start_0 pcmk-1" [ style = bold]
 "probe_complete" [ style=dashed color="red" fontcolor="orange"]
+"stonith pcmk-10" -> "all_stopped" [ style = bold]
+"stonith pcmk-10" -> "stonith_complete" [ style = bold]
+"stonith pcmk-10" [ style=bold color="green" fontcolor="black"]
 "stonith pcmk-5" -> "all_stopped" [ style = bold]
 "stonith pcmk-5" -> "stonith pcmk-7" [ style = bold]
 "stonith pcmk-5" [ style=bold color="green" fontcolor="black"]
 "stonith pcmk-7" -> "all_stopped" [ style = bold]
 "stonith pcmk-7" -> "stonith pcmk-8" [ style = bold]
 "stonith pcmk-7" [ style=bold color="green" fontcolor="black"]
 "stonith pcmk-8" -> "all_stopped" [ style = bold]
-"stonith pcmk-8" -> "stonith_complete" [ style = bold]
+"stonith pcmk-8" -> "stonith pcmk-10" [ style = bold]
 "stonith pcmk-8" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
+"stonith_up" -> "stonith pcmk-10" [ style = bold]
 "stonith_up" -> "stonith pcmk-5" [ style = bold]
 "stonith_up" -> "stonith pcmk-7" [ style = bold]
 "stonith_up" -> "stonith pcmk-8" [ style = bold]
 "stonith_up" -> "stonith_complete" [ style = bold]
 "stonith_up" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/stonith-4.exp b/pengine/test10/stonith-4.exp
index f90121d530..410d76b313 100644
--- a/pengine/test10/stonith-4.exp
+++ b/pengine/test10/stonith-4.exp
@@ -1,124 +1,142 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="8" operation="start" operation_key="Fencing_start_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="Fencing" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="Fencing_monitor_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="Fencing" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
+    <action_set>
+      <crm_event id="15" operation="stonith" operation_key="stonith" on_node="pcmk-10" on_node_uuid="110">
+        <attributes CRM_meta_on_node="pcmk-10" CRM_meta_on_node_uuid="110" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.6"/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up"/>
+      </trigger>
+      <trigger>
+        <crm_event id="14" operation="stonith" operation_key="stonith" on_node="pcmk-8" on_node_uuid="108"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="3">
     <action_set>
       <crm_event id="14" operation="stonith" operation_key="stonith" on_node="pcmk-8" on_node_uuid="108">
         <attributes CRM_meta_on_node="pcmk-8" CRM_meta_on_node_uuid="108" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.6"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up"/>
       </trigger>
       <trigger>
         <crm_event id="13" operation="stonith" operation_key="stonith" on_node="pcmk-7" on_node_uuid="107"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3">
+  <synapse id="4">
     <action_set>
       <crm_event id="13" operation="stonith" operation_key="stonith" on_node="pcmk-7" on_node_uuid="107">
         <attributes CRM_meta_on_node="pcmk-7" CRM_meta_on_node_uuid="107" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.6"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up"/>
       </trigger>
       <trigger>
         <crm_event id="12" operation="stonith" operation_key="stonith" on_node="pcmk-5" on_node_uuid="105"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="4">
+  <synapse id="5">
     <action_set>
       <crm_event id="12" operation="stonith" operation_key="stonith" on_node="pcmk-5" on_node_uuid="105">
         <attributes CRM_meta_on_node="pcmk-5" CRM_meta_on_node_uuid="105" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.6"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="6">
     <action_set>
       <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes crm_feature_set="3.0.6"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up"/>
       </trigger>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith" on_node="pcmk-8" on_node_uuid="108"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith" on_node="pcmk-10" on_node_uuid="110"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6">
+  <synapse id="7">
     <action_set>
       <pseudo_event id="10" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.6"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="12" operation="stonith" operation_key="stonith" on_node="pcmk-5" on_node_uuid="105"/>
       </trigger>
       <trigger>
         <crm_event id="13" operation="stonith" operation_key="stonith" on_node="pcmk-7" on_node_uuid="107"/>
       </trigger>
       <trigger>
         <crm_event id="14" operation="stonith" operation_key="stonith" on_node="pcmk-8" on_node_uuid="108"/>
       </trigger>
+      <trigger>
+        <crm_event id="15" operation="stonith" operation_key="stonith" on_node="pcmk-10" on_node_uuid="110"/>
+      </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="8">
     <action_set>
       <pseudo_event id="9" operation="stonith_up" operation_key="stonith_up">
         <attributes crm_feature_set="3.0.6"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" operation="start" operation_key="Fencing_start_0" on_node="pcmk-1" on_node_uuid="101"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8" priority="1000000">
+  <synapse id="9" priority="1000000">
     <action_set>
       <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="101">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="monitor" operation_key="Fencing_monitor_0" on_node="pcmk-1" on_node_uuid="101"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/stonith-4.scores b/pengine/test10/stonith-4.scores
index 504b2c809d..c1a1053c5d 100644
--- a/pengine/test10/stonith-4.scores
+++ b/pengine/test10/stonith-4.scores
@@ -1,12 +1,13 @@
 Allocation scores:
 An invalid transition was produced
 Transition failed: terminated
+native_color: Fencing allocation score on pcmk-10: 0
 native_color: Fencing allocation score on pcmk-1: 0
 native_color: Fencing allocation score on pcmk-2: 0
 native_color: Fencing allocation score on pcmk-3: 0
 native_color: Fencing allocation score on pcmk-4: 0
 native_color: Fencing allocation score on pcmk-5: 0
 native_color: Fencing allocation score on pcmk-6: 0
 native_color: Fencing allocation score on pcmk-7: 0
 native_color: Fencing allocation score on pcmk-8: 0
 native_color: Fencing allocation score on pcmk-9: 0
diff --git a/pengine/test10/stonith-4.summary b/pengine/test10/stonith-4.summary
index 6e4155fc2c..0fc1e054ed 100644
--- a/pengine/test10/stonith-4.summary
+++ b/pengine/test10/stonith-4.summary
@@ -1,33 +1,35 @@
 
 Current cluster status:
 Node pcmk-2 (102): pending
 Node pcmk-3 (103): pending
 Node pcmk-5 (105): UNCLEAN (offline)
 Node pcmk-7 (107): UNCLEAN (online)
 Node pcmk-8 (108): UNCLEAN (offline)
 Node pcmk-9 (109): pending
+Node pcmk-10 (110): UNCLEAN (online)
 Online: [ pcmk-1 ]
 OFFLINE: [ pcmk-4 pcmk-6 ]
 
  Fencing	(stonith:fence_xvm):	Stopped 
 
 Transition Summary:
  * Start   Fencing	(pcmk-1)
 
 Executing cluster transition:
  * Resource action: Fencing         monitor on pcmk-1
 Transition failed: terminated
 An invalid transition was produced
 
 Revised cluster status:
 Node pcmk-2 (102): pending
 Node pcmk-3 (103): pending
 Node pcmk-5 (105): UNCLEAN (offline)
 Node pcmk-7 (107): UNCLEAN (online)
 Node pcmk-8 (108): UNCLEAN (offline)
 Node pcmk-9 (109): pending
+Node pcmk-10 (110): UNCLEAN (online)
 Online: [ pcmk-1 ]
 OFFLINE: [ pcmk-4 pcmk-6 ]
 
  Fencing	(stonith:fence_xvm):	Stopped 
 
diff --git a/pengine/test10/stonith-4.xml b/pengine/test10/stonith-4.xml
index 5575fadb6f..8645acb262 100644
--- a/pengine/test10/stonith-4.xml
+++ b/pengine/test10/stonith-4.xml
@@ -1,71 +1,75 @@
 <cib epoch="10" num_updates="4" admin_epoch="0" validate-with="pacemaker-1.2" crm_feature_set="3.0.6" update-origin="pcmk-1" update-client="crmd" cib-last-written="Tue Jul 17 19:02:05 2012" have-quorum="1" dc-uuid="101">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.8-0.772.26fe3e5.git.fc17-26fe3e52d259e4726699300d27991fc1a80c556b"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="101" uname="pcmk-1" type="normal"/>
       <node id="102" uname="pcmk-2"/>
       <node id="103" uname="pcmk-3"/>
       <node id="104" uname="pcmk-4"/>
       <node id="105" uname="pcmk-5"/>
       <node id="106" uname="pcmk-6" type="ping"/>
       <node id="107" uname="pcmk-7"/>
       <node id="108" uname="pcmk-8"/>
       <node id="109" uname="pcmk-9"/>
+      <node id="110" uname="pcmk-10"/>
     </nodes>
     <resources>
       <primitive id="Fencing" class="stonith" type="fence_xvm"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <!-- Ok - Active -->
     <node_state id="101" uname="pcmk-1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_state_transition" shutdown="0">
       <lrm id="101">
         <lrm_resources/>
       </lrm>
       <transient_attributes id="101">
         <instance_attributes id="status-101">
           <nvpair id="status-101-probe_complete" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
 
     <!-- Pending - Corosync only -->
     <node_state id="102" uname="pcmk-2" crmd="offline" join="down" crm-debug-origin="post_cache_update" in_ccm="true"/>
 
     <!-- Pending - Active but not joined -->
     <node_state id="103" uname="pcmk-3" crmd="online" join="down" crm-debug-origin="crmd_proc_update" in_ccm="true"/>
 
     <!-- Ok - Shutting down -->
     <node_state id="104" uname="pcmk-4" in_ccm="false" crmd="offline" join="down" expected="member" crm-debug-origin="do_state_transition">
       <transient_attributes id="104">
         <instance_attributes id="status-104">
           <nvpair id="status-104-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-104-shutdown" name="shutdown" value="1"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
 
     <!-- Fence - Unknown -->
     <node_state id="105" uname="pcmk-5" crmd="offline" join="down" crm-debug-origin="post_cache_update"/>
 
     <!-- Ignore - Quorum node -->
     <node_state id="106" uname="pcmk-6" crmd="offline" join="down" crm-debug-origin="post_cache_update"/>
 
     <!-- Fence - Evicted -->
     <node_state id="107" uname="pcmk-7" crmd="online" join="banned" crm-debug-origin="crmd_proc_update" in_ccm="true"/>
 
     <!-- Fence - CPG up, Quorum unknown -->
     <node_state id="108" uname="pcmk-8" crmd="online" join="down" crm-debug-origin="crmd_proc_update"/>
 
     <!-- Pending - CPG up, Quorum down -->
     <node_state id="109" uname="pcmk-9" crmd="online" join="down" crm-debug-origin="crmd_proc_update" in_ccm="false"/>
 
+    <!-- Fence - Peer not available -->
+    <node_state id="110" uname="pcmk-10" in_ccm="true" crmd="offline" join="member" expected="member" crm-debug-origin="post_cache_update"/>
+
   </status>
 </cib>