diff --git a/crm/pengine/testcases/simple10.exp b/crm/pengine/testcases/simple10.exp
new file mode 100644
index 0000000000..5ba8bec336
--- /dev/null
+++ b/crm/pengine/testcases/simple10.exp
@@ -0,0 +1 @@
+<transition_graph/>
diff --git a/crm/pengine/testcases/simple10.xml b/crm/pengine/testcases/simple10.xml
new file mode 100644
index 0000000000..4ee82c5e7a
--- /dev/null
+++ b/crm/pengine/testcases/simple10.xml
@@ -0,0 +1,25 @@
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache" version="1.0"/>
+	</lrm_agents>
+        <lrm_resources/>
+      </lrm>
+    </node_state>
+ </status>
+</cib>
diff --git a/crm/pengine/testcases/simple5.exp b/crm/pengine/testcases/simple5.exp
index 1bba95202f..0b2cdc7410 100644
--- a/crm/pengine/testcases/simple5.exp
+++ b/crm/pengine/testcases/simple5.exp
@@ -1,12 +1,12 @@
 <transition_graph>
   <actions id="0">
     <rsc_op id="1" rsc_id="rsc1" target="node1" task="stop" runnable="true" optional="true" discard="false" allow_fail="true">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
     </rsc_op>
     <crm_event id="3" target="node1" task="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true"/>
     <pseduo_event id="4" target="node1" task="stonith" runnable="true" optional="false" discard="false" allow_fail="false"/>
     <rsc_op id="2" rsc_id="rsc1" target="node1" task="start" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple9.exp b/crm/pengine/testcases/simple9.exp
new file mode 100644
index 0000000000..2e32ef0e9e
--- /dev/null
+++ b/crm/pengine/testcases/simple9.exp
@@ -0,0 +1,7 @@
+<transition_graph>
+  <actions id="0">
+    <rsc_op id="2" rsc_id="rsc1" target="node1" task="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
+    </rsc_op>
+  </actions>
+</transition_graph>
diff --git a/crm/pengine/testcases/simple9.xml b/crm/pengine/testcases/simple9.xml
new file mode 100644
index 0000000000..60616d21eb
--- /dev/null
+++ b/crm/pengine/testcases/simple9.xml
@@ -0,0 +1,25 @@
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache" version="3.0"/>
+	</lrm_agents>
+        <lrm_resources/>
+      </lrm>
+    </node_state>
+ </status>
+</cib>
diff --git a/crm/pengine/testcases/simple5.exp b/crm/pengine/testcases/stopfail1.exp
similarity index 91%
copy from crm/pengine/testcases/simple5.exp
copy to crm/pengine/testcases/stopfail1.exp
index 1bba95202f..0b2cdc7410 100644
--- a/crm/pengine/testcases/simple5.exp
+++ b/crm/pengine/testcases/stopfail1.exp
@@ -1,12 +1,12 @@
 <transition_graph>
   <actions id="0">
     <rsc_op id="1" rsc_id="rsc1" target="node1" task="stop" runnable="true" optional="true" discard="false" allow_fail="true">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
     </rsc_op>
     <crm_event id="3" target="node1" task="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true"/>
     <pseduo_event id="4" target="node1" task="stonith" runnable="true" optional="false" discard="false" allow_fail="false"/>
     <rsc_op id="2" rsc_id="rsc1" target="node1" task="start" runnable="true" optional="true" discard="false" allow_fail="false">
-      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.xml b/crm/pengine/testcases/stopfail1.xml
new file mode 100644
index 0000000000..0ea0cdb2cc
--- /dev/null
+++ b/crm/pengine/testcases/stopfail1.xml
@@ -0,0 +1,32 @@
+<!-- shutdown then stontih -->
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
+	       on_stopfail="stonith"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+  <crm_config>
+    <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
+  </crm_config>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+ </status>
+</cib>
diff --git a/crm/pengine/testcases/stopfail2.exp b/crm/pengine/testcases/stopfail2.exp
new file mode 100644
index 0000000000..5ba8bec336
--- /dev/null
+++ b/crm/pengine/testcases/stopfail2.exp
@@ -0,0 +1 @@
+<transition_graph/>
diff --git a/crm/pengine/testcases/stopfail2.xml b/crm/pengine/testcases/stopfail2.xml
new file mode 100644
index 0000000000..f22275ddd2
--- /dev/null
+++ b/crm/pengine/testcases/stopfail2.xml
@@ -0,0 +1,29 @@
+<!-- shutdown then stontih -->
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
+	       on_stopfail="block"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+ </status>
+</cib>
diff --git a/crm/pengine/testcases/stopfail3.exp b/crm/pengine/testcases/stopfail3.exp
new file mode 100644
index 0000000000..5ba8bec336
--- /dev/null
+++ b/crm/pengine/testcases/stopfail3.exp
@@ -0,0 +1 @@
+<transition_graph/>
diff --git a/crm/pengine/testcases/stopfail3.xml b/crm/pengine/testcases/stopfail3.xml
new file mode 100644
index 0000000000..faff9d562b
--- /dev/null
+++ b/crm/pengine/testcases/stopfail3.xml
@@ -0,0 +1,28 @@
+<!-- shutdown then stontih -->
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+</status>
+</cib>
diff --git a/crm/pengine/testcases/stopfail4.exp b/crm/pengine/testcases/stopfail4.exp
new file mode 100644
index 0000000000..3ed02872d7
--- /dev/null
+++ b/crm/pengine/testcases/stopfail4.exp
@@ -0,0 +1,7 @@
+<transition_graph>
+  <actions id="0">
+    <rsc_op id="2" rsc_id="rsc1" target="node2" task="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
+    </rsc_op>
+  </actions>
+</transition_graph>
diff --git a/crm/pengine/testcases/stopfail4.xml b/crm/pengine/testcases/stopfail4.xml
new file mode 100644
index 0000000000..594eed3568
--- /dev/null
+++ b/crm/pengine/testcases/stopfail4.xml
@@ -0,0 +1,37 @@
+<!-- shutdown then stontih -->
+<cib>
+ <configuration>
+  <nodes>
+    <node id="node1" uname="node1" type="member"/>
+    <node id="node2" uname="node2" type="member"/>
+  </nodes>
+  <resources>
+     <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
+  </resources>
+  <constraints>
+      <rsc_location id="run_rsc1" rsc="rsc1">
+	<rule id="can1" result="can"/>
+      </rsc_location>
+  </constraints>
+ </configuration>
+ <status>
+    <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources>
+          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
+      <lrm>
+	<lrm_agents>
+	  <lrm_agent class="heartbeat" type="apache"/>
+	</lrm_agents>
+        <lrm_resources/>
+      </lrm>
+    </node_state>
+ </status>
+</cib>