diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index 3d10da84f6..5d70d122ef 100644
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -77,10 +77,12 @@ if __name__ == '__main__':
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
     # And then, this got renamed from rpms-checks to test-rpms
     # https://pagure.io/fedora-infrastructure/issue/5570
-    data['test-rpms'] = copy.copy(data['rpms'])
+    if 'rpms' in data:
+        data['test-rpms'] = copy.copy(data['rpms'])
     # Also, modules are a thing
     # https://pagure.io/fedora-infrastructure/issue/5571
-    data['test-modules'] = copy.copy(data['modules'])
+    if 'modules' in data:
+        data['test-modules'] = copy.copy(data['modules'])
 
     # Get a list of all the packages
     for key in data:
diff --git a/roles/distgit/templates/genacls.pkgdb.stg b/roles/distgit/templates/genacls.pkgdb.stg
index 196282afa2..d871bb8f0b 100644
--- a/roles/distgit/templates/genacls.pkgdb.stg
+++ b/roles/distgit/templates/genacls.pkgdb.stg
@@ -293,10 +293,12 @@ if __name__ == '__main__':
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
     # And then, this got renamed from rpms-checks to test-rpms
     # https://pagure.io/fedora-infrastructure/issue/5570
-    data['test-rpms'] = copy.copy(data['rpms'])
+    if 'rpms' in data:
+        data['test-rpms'] = copy.copy(data['rpms'])
     # Also, modules are a thing
     # https://pagure.io/fedora-infrastructure/issue/5571
-    data['test-modules'] = copy.copy(data['modules'])
+    if 'modules' in data:
+        data['test-modules'] = copy.copy(data['modules'])
 
     # Get a list of all the packages
     for key in data:
diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py
index dad409cd9e..f5ee7ce9cf 100644
--- a/roles/distgit/templates/pkgdb_sync_git_branches.py
+++ b/roles/distgit/templates/pkgdb_sync_git_branches.py
@@ -256,10 +256,12 @@ def main():
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
     # And then, this got renamed from rpms-checks to test-rpms
     # https://pagure.io/fedora-infrastructure/issue/5570
-    pkgdb_info['test-rpms'] = copy.copy(pkgdb_info['rpms'])
+    if 'rpms' in pkgdb_info:
+        pkgdb_info['test-rpms'] = copy.copy(pkgdb_info['rpms'])
     # Also, modules are a thing
     # https://pagure.io/fedora-infrastructure/issue/5571
-    pkgdb_info['test-modules'] = copy.copy(pkgdb_info['modules'])
+    if 'modules' in pkgdb_info:
+        pkgdb_info['test-modules'] = copy.copy(pkgdb_info['modules'])
 
     for ns in pkgdb_info:
         namespace = ns