diff --git a/cts/cli/crm_diff_new.xml b/cts/cli/crm_diff_new.xml
index 7fa0cbbd1b..121c929f3c 100644
--- a/cts/cli/crm_diff_new.xml
+++ b/cts/cli/crm_diff_new.xml
@@ -1,54 +1,54 @@
-<cib crm_feature_set="3.2.0" validate-with="pacemaker-3.2" epoch="1" num_updates="0" admin_epoch="0">
+<cib crm_feature_set="3.2.0" validate-with="pacemaker-3.2" epoch="2" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <!-- test: move attribute "value" before "name" -->
         <nvpair id="cib-bootstrap-options-cluster-name" value="mycluster" name="cluster-name"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="1"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1" uname="node1"/>
       <node id="2" uname="node2"/>
       <node id="3" uname="node3"/>
       <!-- test: add element for node4 -->
       <node id="4" uname="node4"/>
     </nodes>
     <!-- test: add a new comment below this one -->
     <!-- hello world -->
     <resources>
       <!-- test: modify this comment to say something different -->
       <primitive id="Fencing" class="stonith" type="fence_xvm">
         <meta_attributes id="Fencing-meta">
           <nvpair id="Fencing-migration-threshold" name="migration-threshold" value="5"/>
         </meta_attributes>
         <instance_attributes id="Fencing-params">
           <nvpair id="Fencing-key_file" name="key_file" value="/etc/pacemaker/fence_xvm.key"/>
           <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/>
           <!-- test: modify attribute value to add node4 -->
           <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3 node4"/>
         </instance_attributes>
         <operations>
           <!-- test: add attribute timeout="120s" -->
           <op id="Fencing-monitor-120s" interval="120s" timeout="120s" name="monitor"/>
           <op id="Fencing-stop-0" interval="0" name="stop" timeout="60s"/>
           <!-- test: delete element Fencing-start-0 -->
         </operations>
       </primitive>
       <primitive id="dummy" class="ocf" type="pacemaker" provider="Dummy">
         <instance_attributes id="dummy-params">
           <!-- test: move element dummy-fake below dummy-op_sleep -->
           <nvpair id="dummy-op_sleep" name="op_sleep" value="3"/>
           <nvpair id="dummy-fake" name="fake" value="0"/>
         </instance_attributes>
         <operations>
           <!-- test: delete attribute timeout -->
           <op id="dummy-monitor-5s" interval="5s" name="monitor"/>
         </operations>
       </primitive>
     </resources>
     <constraints/>
     <!-- test: move this comment to end of configuration -->
   </configuration>
   <status/>
 </cib>
diff --git a/cts/cli/regression.crm_diff.exp b/cts/cli/regression.crm_diff.exp
index 6b1a7109dd..b233753c6e 100644
--- a/cts/cli/regression.crm_diff.exp
+++ b/cts/cli/regression.crm_diff.exp
@@ -1,66 +1,74 @@
 =#=#=#= Begin test: Create an XML patchset =#=#=#=
 <diff format="2">
   <version>
     <source admin_epoch="0" epoch="1" num_updates="0"/>
-    <target admin_epoch="0" epoch="1" num_updates="0"/>
+    <target admin_epoch="0" epoch="2" num_updates="0"/>
   </version>
   <change operation="delete" path="/cib/configuration/comment" position="0"/>
   <change operation="delete" path="/cib/configuration/comment" position="1"/>
   <change operation="delete" path="/cib/configuration/comment" position="2"/>
   <change operation="delete" path="/cib/configuration/resources/comment" position="0"/>
   <change operation="delete" path="/cib/configuration/resources/primitive[@id='Fencing']/operations/op[@id='Fencing-start-0']"/>
+  <change operation="modify" path="/cib">
+    <change-list>
+      <change-attr name="epoch" operation="set" value="2"/>
+    </change-list>
+    <change-result>
+      <cib epoch="2" num_updates="0" admin_epoch="0"/>
+    </change-result>
+  </change>
   <change operation="modify" path="/cib/configuration/crm_config/cluster_property_set[@id='cib-bootstrap-options']/nvpair[@id='cib-bootstrap-options-cluster-name']">
     <change-list>
       <change-attr name="value" operation="set" value="mycluster"/>
       <change-attr name="name" operation="set" value="cluster-name"/>
     </change-list>
     <change-result>
       <nvpair id="cib-bootstrap-options-cluster-name" value="mycluster" name="cluster-name"/>
     </change-result>
   </change>
   <change operation="create" path="/cib/configuration/nodes" position="4">
     <node id="4" uname="node4"/>
   </change>
   <change operation="create" path="/cib/configuration" position="2">
     <!-- test: add a new comment below this one -->
   </change>
   <change operation="create" path="/cib/configuration" position="3">
     <!-- hello world -->
   </change>
   <change operation="create" path="/cib/configuration/resources" position="0">
     <!-- test: modify this comment to say something different -->
   </change>
   <change operation="modify" path="/cib/configuration/resources/primitive[@id='Fencing']/instance_attributes[@id='Fencing-params']/nvpair[@id='Fencing-pcmk_host_list']">
     <change-list>
       <change-attr name="value" operation="set" value="node1 node2 node3 node4"/>
     </change-list>
     <change-result>
       <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3 node4"/>
     </change-result>
   </change>
   <change operation="modify" path="/cib/configuration/resources/primitive[@id='Fencing']/operations/op[@id='Fencing-monitor-120s']">
     <change-list>
       <change-attr name="timeout" operation="set" value="120s"/>
       <change-attr name="name" operation="set" value="monitor"/>
     </change-list>
     <change-result>
       <op id="Fencing-monitor-120s" interval="120s" timeout="120s" name="monitor"/>
     </change-result>
   </change>
   <change operation="move" path="/cib/configuration/resources/primitive[@id='dummy']/instance_attributes[@id='dummy-params']/nvpair[@id='dummy-op_sleep']" position="1"/>
   <change operation="move" path="/cib/configuration/resources/primitive[@id='dummy']/instance_attributes[@id='dummy-params']/nvpair[@id='dummy-fake']" position="2"/>
   <change operation="modify" path="/cib/configuration/resources/primitive[@id='dummy']/operations/op[@id='dummy-monitor-5s']">
     <change-list>
       <change-attr name="name" operation="set" value="monitor"/>
       <change-attr name="timeout" operation="unset"/>
     </change-list>
     <change-result>
       <op id="dummy-monitor-5s" interval="5s" name="monitor"/>
     </change-result>
   </change>
   <change operation="create" path="/cib/configuration" position="6">
     <!-- test: move this comment to end of configuration -->
   </change>
 </diff>
 =#=#=#= End test: Create an XML patchset - Error occurred (1) =#=#=#=
 * Passed: crm_diff              - Create an XML patchset