diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec
index 6820e52..03e8e24 100644
--- a/SPECS/pcp.spec
+++ b/SPECS/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 5.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -2562,6 +2562,9 @@ $1 == "d" {
             if (match ($5, "'$PCP_RUN_DIR'")) {
                 printf ("%%%%ghost ") >> f;
             }
+            if (match ($5, "'$PCP_VAR_DIR'/testsuite")) {
+                $3 = $4 = "pcpqa";
+            }
             printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $5) >> f
           }
 $1 == "f" && $6 ~ "etc/pcp\\.conf" { printf ("%%%%config ") >> f; }
@@ -2574,6 +2577,9 @@ $1 == "f" {
                     break;
                 }
             }
+            if (match ($6, "'$PCP_VAR_DIR'/testsuite")) {
+                $3 = $4 = "pcpqa";
+            }
             if (match ($6, "'$PCP_MAN_DIR'") || match ($6, "'$PCP_DOC_DIR'")) {
                 printf ("%%%%doc ") >> f;
             }
@@ -3053,7 +3059,6 @@ PCP_LOG_DIR=%{_logsdir}
 %endif
 
 %files testsuite -f pcp-testsuite-files.rpm
-%defattr(-,pcpqa,pcpqa)
 
 %if !%{disable_infiniband}
 %files pmda-infiniband -f pcp-pmda-infiniband-files.rpm
@@ -3306,6 +3311,9 @@ PCP_LOG_DIR=%{_logsdir}
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Thu Apr 22 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-3
+- Correct pcp-testsuite file permissions (BZ 1922040)
+
 * Tue Apr 20 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-2
 - Resolve pcp-testsuite linkage problems (BZ 1950263)