diff --git a/pengine/test10/quorum-5.exp b/pengine/test10/quorum-5.exp
index 1f31eb71e3..ccff65d6ec 100644
--- a/pengine/test10/quorum-5.exp
+++ b/pengine/test10/quorum-5.exp
@@ -1,135 +1,135 @@
 <transition_graph cluster-delay="120s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
       <pseudo_event id="11" operation="running" operation_key="group1_running_0">
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="6" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
         <rsc_op id="8" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
         <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="10" operation="start" operation_key="group1_start_0">
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="2">
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_DoFencing_1_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_1" class="stonith" type="ssh"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="3">
      <action_set>
       <rsc_op id="6" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_1" class="stonith" type="ssh"/>
         <attributes CRM_meta_name="start" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
         <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_1" class="stonith" type="ssh"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="9" operation="monitor" operation_key="child_DoFencing_2_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_2" class="stonith" type="ssh"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="8" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_name="start" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
         <rsc_op id="6" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
         <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="7">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing_2" class="stonith" type="ssh"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6" hostlist="hadev1 hadev2 hadev3 "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
         <rsc_op id="5" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="9">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.6"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/quorum-5.xml b/pengine/test10/quorum-5.xml
index b338da65d7..9336ceaf12 100644
--- a/pengine/test10/quorum-5.xml
+++ b/pengine/test10/quorum-5.xml
@@ -1,47 +1,47 @@
 <cib admin_epoch="0" epoch="262" num_updates="8358" dc-uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:12 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21844" name="cluster-delay" value="120s"/>
         <nvpair id="nvpair.id21853" name="symetric_cluster" value="true"/>
         <nvpair id="nvpair.id21862" name="suppress_cib_writes" value="false"/>
         <nvpair id="nvpair.id21872" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21881" name="stonith-enabled" value="true"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="6125a0df-456a-4395-829a-418e9a380d36" uname="hadev1" type="member"/>
       <node id="190b75b6-5585-42d9-8cde-eb6041843ae3" uname="hadev2" type="member"/>
       <node id="879e65f8-4b38-4c56-9552-4752ad436669" uname="hadev3" type="member"/>
     </nodes>
     <resources>
       <group id="group1">
         <primitive id="child_DoFencing_1" class="stonith" type="ssh">
           <operations>
             <op name="start" interval="0" id="op.auto-1" requires="nothing"/>
             <op name="monitor" interval="5s" id="op.auto-2" timeout="20s"/>
           </operations>
           <instance_attributes id="instance_attributes.id21958">
             <nvpair id="nvpair.id21965" name="hostlist" value="hadev1 hadev2 hadev3 "/>
           </instance_attributes>
           <meta_attributes id="primitive-child_DoFencing_1.meta"/>
         </primitive>
         <primitive id="child_DoFencing_2" class="stonith" type="ssh">
           <operations>
-            <op name="start" interval="0" id="op.auto-1" requires="nothing"/>
+            <op name="start" interval="0" id="op.auto-4" requires="nothing"/>
             <op name="monitor" interval="5s" id="op.auto-3" timeout="20s"/>
           </operations>
           <instance_attributes id="instance_attributes.id21997">
             <nvpair id="nvpair.id22003" name="hostlist" value="hadev1 hadev2 hadev3 "/>
           </instance_attributes>
           <meta_attributes id="primitive-child_DoFencing_2.meta"/>
         </primitive>
         <meta_attributes id="group-group1.meta"/>
       </group>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="190b75b6-5585-42d9-8cde-eb6041843ae3" uname="hadev2" in_ccm="true" join="member" crmd="online" ha="active" expected="member"/>
   </status>
 </cib>