diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index ae11834337..60ef9d4729 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -101,9 +101,10 @@
   - rpms
   - docker
   - modules
-  # Except for this one.  This namespace is artificially created in the
+  # Except for these two.  These namespaces are artificially created in the
   # dist-git pkgdb sync scripts.
-  - rpms-checks
+  - test-rpms
+  - test-modules
   tags:
   - distgit
 
diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index c65f1180d5..3d10da84f6 100644
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -71,11 +71,16 @@ if __name__ == '__main__':
     #print '    RW  private-     = @all'
     # dont' enable the above until we prevent building for real from private-
 
-    # XXX - Insert an artificial namespace into the set of namespaces returned
-    # by pkgdb.  We want to create a mirror of rpms/PKG in rpms-checks/PKG
+    # XXX - Insert artificial namespaces into the set of namespaces returned
+    # by pkgdb.  We want to create a mirror of rpms/PKG in test-rpms/PKG
     # This hack occurs in two places.  Here, and in the branch-creation script.
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
-    data['rpms-checks'] = copy.copy(data['rpms'])
+    # 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'])
+    # Also, modules are a thing
+    # https://pagure.io/fedora-infrastructure/issue/5571
+    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 a9f7539b0f..196282afa2 100644
--- a/roles/distgit/templates/genacls.pkgdb.stg
+++ b/roles/distgit/templates/genacls.pkgdb.stg
@@ -287,11 +287,16 @@ if __name__ == '__main__':
     #print '    RW  private-     = @all'
     # dont' enable the above until we prevent building for real from private-
 
-    # XXX - Insert an artificial namespace into the set of namespaces returned
-    # by pkgdb.  We want to create a mirror of rpms/PKG in rpms-checks/PKG
+    # XXX - Insert artificial namespaces into the set of namespaces returned
+    # by pkgdb.  We want to create a mirror of rpms/PKG in test-rpms/PKG
     # This hack occurs in two places.  Here, and in the branch-creation script.
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
-    data['rpms-checks'] = copy.copy(data['rpms'])
+    # 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'])
+    # Also, modules are a thing
+    # https://pagure.io/fedora-infrastructure/issue/5571
+    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 38fd6b12da..dad409cd9e 100644
--- a/roles/distgit/templates/pkgdb_sync_git_branches.py
+++ b/roles/distgit/templates/pkgdb_sync_git_branches.py
@@ -250,11 +250,16 @@ def main():
 
     pkgdb_info = pkgdb_pkg_branch()
 
-    # XXX - Insert an artificial namespace into the set of namespaces returned
-    # by pkgdb.  We want to create a mirror of rpms/PKG in rpms-checks/PKG
+    # XXX - Insert artificial namespaces into the set of namespaces returned
+    # by pkgdb.  We want to create a mirror of rpms/PKG in test-rpms/PKG
     # This hack occurs in two places.  Here, and in genacls.pkgdb.
     # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
-    pkgdb_info['rpms-checks'] = copy.copy(pkgdb_info['rpms'])
+    # 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'])
+    # Also, modules are a thing
+    # https://pagure.io/fedora-infrastructure/issue/5571
+    pkgdb_info['test-modules'] = copy.copy(pkgdb_info['modules'])
 
     for ns in pkgdb_info:
         namespace = ns