diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
index 937c4d3074..905e55a952 100644
--- a/cts/cli/regression.upgrade.exp
+++ b/cts/cli/regression.upgrade.exp
@@ -1,143 +1,159 @@
+=#=#=#= Begin test: Run cibadmin with upgrade and force flags =#=#=#=
+pcmk__update_schema 	debug: Schema pacemaker-2.10 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.0 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.1 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.2 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.3 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.4 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.5 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.6 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.7 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.8 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.9 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.10 validates
+pcmk__update_schema 	debug: Schema pacemaker-4.0 validates
+pcmk__update_schema 	info: Transformed the configuration schema to pacemaker-4.0
+=#=#=#= Current cib after: Run cibadmin with upgrade and force flags =#=#=#=
+<cib epoch="1" num_updates="2" admin_epoch="1">
+  <configuration>
+    <crm_config/>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Run cibadmin with upgrade and force flags - OK (0) =#=#=#=
+* Passed: cibadmin              - Run cibadmin with upgrade and force flags
 =#=#=#= Begin test: Set stonith-enabled=false =#=#=#=
 =#=#=#= Current cib after: Set stonith-enabled=false =#=#=#=
-<cib epoch="2" num_updates="0" admin_epoch="0">
+<cib epoch="2" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources/>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Set stonith-enabled=false - OK (0) =#=#=#=
 * Passed: crm_attribute         - Set stonith-enabled=false
 =#=#=#= Begin test: Configure the initial resource =#=#=#=
 =#=#=#= Current cib after: Configure the initial resource =#=#=#=
-<cib epoch="3" num_updates="0" admin_epoch="0">
+<cib epoch="3" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
           <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
             <instance_attributes id="mySmartFuse-inputpower-instanceparams">
               <nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
             </instance_attributes>
           </op>
           <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
             <instance_attributes id="mySmartFuse-outputpower-instanceparams">
               <nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
             </instance_attributes>
           </op>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
         <instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Configure the initial resource - OK (0) =#=#=#=
 * Passed: cibadmin              - Configure the initial resource
 =#=#=#= Begin test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
-pcmk__update_schema 	debug: Schema pacemaker-2.10 validates
-apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-0.xsl
-apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-1.xsl
-INFO: Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
-INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
-INFO: Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
-INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
-apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-2.xsl
-DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
-apply_upgrade 	info: Schema upgrade from pacemaker-2.10 to pacemaker-3.0 succeeded
-pcmk__update_schema 	debug: Schema pacemaker-3.0 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.1 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.2 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.3 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.4 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.5 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.6 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.7 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.8 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.9 validates
-pcmk__update_schema 	debug: Schema pacemaker-3.10 validates
-pcmk__update_schema 	debug: Schema pacemaker-4.0 validates
-pcmk__update_schema 	info: Transformed the configuration schema to pacemaker-4.0
 =#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
-<cib epoch="2" num_updates="0" admin_epoch="1">
+<cib epoch="3" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
-          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
-          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
+          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
+            <instance_attributes id="mySmartFuse-inputpower-instanceparams">
+              <nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
+            </instance_attributes>
+          </op>
+          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
+            <instance_attributes id="mySmartFuse-outputpower-instanceparams">
+              <nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
+            </instance_attributes>
+          </op>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
-        <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
-          <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
-        </instance_attributes>
+        <instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) - OK (0) =#=#=#=
 * Passed: cibadmin              - Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping)
 =#=#=#= Begin test: Query a resource instance attribute (shall survive) =#=#=#=
 outputpower
 =#=#=#= Current cib after: Query a resource instance attribute (shall survive) =#=#=#=
-<cib epoch="2" num_updates="0" admin_epoch="1">
+<cib epoch="3" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
-          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
-          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
+          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
+            <instance_attributes id="mySmartFuse-inputpower-instanceparams">
+              <nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
+            </instance_attributes>
+          </op>
+          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
+            <instance_attributes id="mySmartFuse-outputpower-instanceparams">
+              <nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
+            </instance_attributes>
+          </op>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
-        <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
-          <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
-        </instance_attributes>
+        <instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Query a resource instance attribute (shall survive) - OK (0) =#=#=#=
 * Passed: crm_resource          - Query a resource instance attribute (shall survive)