diff --git a/pengine/testcases/bug-lf-1920.exp b/pengine/testcases/bug-lf-1920.exp
index 76f8096421..2d5b0bd2de 100644
--- a/pengine/testcases/bug-lf-1920.exp
+++ b/pengine/testcases/bug-lf-1920.exp
@@ -1,12 +1,12 @@
  <transition_graph cluster-delay="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="mysql-bin_monitor_30000" on_node="dktest2sles10" on_node_uuid="1db2544e-c39c-442c-be34-016c812fcf66">
          <primitive id="mysql-bin" long-id="mysql-bin" class="ocf" provider="heartbeat" type="mysql"/>
-         <attributes crm_feature_set="2.1" socket="/packages/10.0/mysql/var/mysql.sock" binary="/packages/10.0/mysql/bin/mysqld_safe" logfile="/packages/10.0/mysql/var/mysqld.log" config="/packages/10.0/mysql/my.cnf" datadir="/packages/10.0/mysql/var" CRM_meta_id="op-mysql-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="30000"/>
+         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" binary="/packages/10.0/mysql/bin/mysqld_safe" config="/packages/10.0/mysql/my.cnf" crm_feature_set="3.0" datadir="/packages/10.0/mysql/var" logfile="/packages/10.0/mysql/var/mysqld.log" socket="/packages/10.0/mysql/var/mysql.sock"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/testcases/bug-n-385265-2.exp b/pengine/testcases/bug-n-385265-2.exp
index de22548b2c..a2aa70c341 100644
--- a/pengine/testcases/bug-n-385265-2.exp
+++ b/pengine/testcases/bug-n-385265-2.exp
@@ -1,167 +1,167 @@
  <transition_graph cluster-delay="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="12" operation="start" operation_key="group_common_start_0">
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="14" operation="stop" operation_key="group_common_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="15" operation="stopped" operation_key="group_common_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="13" operation="running" operation_key="group_common_running_0">
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="resource_ip_common_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="start" operation_key="resource_idvscommon_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327"/>
        </trigger>
        <trigger>
          <pseudo_event id="12" operation="start" operation_key="group_common_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="14" operation="stop" operation_key="group_common_stop_0">
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="15" operation="stopped" operation_key="group_common_stopped_0">
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="resource_ip_common_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <pseudo_event id="14" operation="stop" operation_key="group_common_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="2" operation="stop" operation_key="resource_ip_common_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5">
          <primitive id="resource_ip_common" long-id="group_common:resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <pseudo_event id="14" operation="stop" operation_key="group_common_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="7" operation="start" operation_key="resource_ip_common_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
          <primitive id="resource_ip_common" long-id="group_common:resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-         <attributes crm_feature_set="2.1" ip="10.116.38.10" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0" ip="10.116.38.10"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="resource_ip_common_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <pseudo_event id="12" operation="start" operation_key="group_common_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="resource_ip_common_monitor_30000" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
          <primitive id="resource_ip_common" long-id="group_common:resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-         <attributes crm_feature_set="2.1" ip="10.116.38.10" CRM_meta_id="common-9af7-4031-8abc-426548ef52c7" CRM_meta_start_delay="30000" CRM_meta_timeout="55000" CRM_meta_name="monitor" CRM_meta_interval="30000"/>
+         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="55000" crm_feature_set="3.0" ip="10.116.38.10"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="resource_ip_common_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="9" operation="start" operation_key="resource_idvscommon_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
          <primitive id="resource_idvscommon" long-id="group_common:resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-         <attributes crm_feature_set="2.1" site="common" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0" site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="resource_ip_common_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <pseudo_event id="12" operation="start" operation_key="group_common_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="10" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5">
          <primitive id="resource_idvscommon" long-id="group_common:resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-         <attributes crm_feature_set="2.1" CRM_meta_timeout="20000"/>
+         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="14" operation="stop" operation_key="group_common_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="resource_idvscommon_monitor_30000" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
          <primitive id="resource_idvscommon" long-id="group_common:resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-         <attributes crm_feature_set="2.1" site="common" CRM_meta_id="common-9af7-4031-8abc-426548ef52c8" CRM_meta_start_delay="120000" CRM_meta_timeout="145000" CRM_meta_name="monitor" CRM_meta_interval="30000"/>
+         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_start_delay="120000" CRM_meta_timeout="145000" crm_feature_set="3.0" site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="9" operation="start" operation_key="resource_idvscommon_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
-         <attributes crm_feature_set="2.1"/>
+         <attributes crm_feature_set="3.0"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="resource_ip_common_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>