diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-0 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-0
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-1 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-2 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-3 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-4 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-4
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-99 b/cts/schemas/test-3/ref.err/remove-after-stop.ref.err-99
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-0 b/cts/schemas/test-3/ref/remove-after-stop.ref-0
new file mode 100644
index 0000000000..c2b7034c02
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-0
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false" original="1"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-1 b/cts/schemas/test-3/ref/remove-after-stop.ref-1
new file mode 100644
index 0000000000..90b6dc3190
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-1
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false" original="1"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-2 b/cts/schemas/test-3/ref/remove-after-stop.ref-2
new file mode 100644
index 0000000000..90b6dc3190
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-2
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false" original="1"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-3 b/cts/schemas/test-3/ref/remove-after-stop.ref-3
new file mode 100644
index 0000000000..90b6dc3190
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-3
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false" original="1"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-4 b/cts/schemas/test-3/ref/remove-after-stop.ref-4
new file mode 100644
index 0000000000..90b6dc3190
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-4
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false" original="1"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/remove-after-stop.ref-99 b/cts/schemas/test-3/ref/remove-after-stop.ref-99
new file mode 100644
index 0000000000..2acd4bf126
--- /dev/null
+++ b/cts/schemas/test-3/ref/remove-after-stop.ref-99
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/cts/schemas/test-3/xml/remove-after-stop.xml b/cts/schemas/test-3/xml/remove-after-stop.xml
new file mode 100644
index 0000000000..f20aca6b5c
--- /dev/null
+++ b/cts/schemas/test-3/xml/remove-after-stop.xml
@@ -0,0 +1,20 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="2" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * The remove-after-stop cluster property is set to any value.
+
+         In this situation, the remove-after-stop cluster property should be
+         removed.
+      -->
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
+        <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>