diff --git a/0006-Test-cts-fencing-Add-a-test-for-metadata.patch b/0006-Test-cts-fencing-Add-a-test-for-metadata.patch
new file mode 100644
index 0000000..1c92251
--- /dev/null
+++ b/0006-Test-cts-fencing-Add-a-test-for-metadata.patch
@@ -0,0 +1,38 @@
+From 18b4c8170efaa4e17fcbfcd2873722de45fb9d25 Mon Sep 17 00:00:00 2001
+From: Grace Chin <gchin@redhat.com>
+Date: Wed, 18 Aug 2021 09:42:57 -0400
+Subject: [PATCH] Test: cts-fencing: Add a test for --metadata
+
+---
+ cts/cts-fencing.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in
+index 8dc5ec8..c4697ee 100644
+--- a/cts/cts-fencing.in
++++ b/cts/cts-fencing.in
+@@ -1423,6 +1423,13 @@ class Tests(object):
+         test.add_stonith_log_pattern("perform 'reboot' action targeting node_fake using true2")
+         test.add_stonith_neg_log_pattern("node_fake with true3")
+ 
++    def build_query_tests(self):
++        """ run stonith_admin --metadata for the fence_dummy agent and check command output """
++
++        test = self.new_test("get_metadata",
++                             "Run stonith_admin --metadata for the fence_dummy agent", 1)
++        test.add_cmd_check_stdout("stonith_admin", "--output-as=xml -a fence_dummy --metadata", '<shortdesc lang')
++
+     def setup_environment(self, use_corosync):
+         """ Prepare the host before executing any tests """
+ 
+@@ -1551,6 +1558,7 @@ def main(argv):
+         tests.build_unfence_on_target_tests()
+         tests.build_nodeid_tests()
+         tests.build_remap_tests()
++        tests.build_query_tests()
+ 
+         if opts.options['list-tests']:
+             tests.print_list()
+-- 
+1.8.3.1
+
diff --git a/0006-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch b/0007-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
similarity index 100%
rename from 0006-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
rename to 0007-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
diff --git a/pacemaker.spec b/pacemaker.spec
index b67c91d..5bc62a5 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -32,7 +32,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.1.1
-%global specversion 7
+%global specversion 8
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
 %global commit 77db57872790c73e44ee7f49005d3ee1dded652e
@@ -220,7 +220,8 @@ Patch1:        0002-Fix-watchdog-fencing-Silence-warning-without-node-re.patch
 Patch2:        0003-Fix-fence_watchdog-fix-version-output-needed-for-hel.patch
 Patch3:        0004-Build-rpm-package-fence_watchdog-in-base-package.patch
 Patch6:        0005-Fix-fence_watchdog-fix-malformed-xml-in-metadata.patch
-Patch7:        0006-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
+Patch7:        0006-Test-cts-fencing-Add-a-test-for-metadata.patch
+Patch8:        0007-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
 
 # upstream commits
 
@@ -829,6 +830,9 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Mon Sep 13 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-8
+- added test for getting metadata via stonith_admin
+
 * Mon Sep 13 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-7
 - added test for metadata of fence_watchdog & fence_dummy