diff --git a/roles.json b/roles.json
index c11af396..c91a898b 100644
--- a/roles.json
+++ b/roles.json
@@ -222,21 +222,26 @@
         }
     },
     {
-        "role": "Documentation infrastructure maintainer",
-        "url": "Documentation_infrastructure_maintainer",
+        "role": "Core infrastructure maintainer",
+        "url": "Core_infrastructure_maintainer",
         "people": [
             "Simon Conseil",
             "Pey Lian Lim",
             "Thomas Robitaille",
             "Brigitta Sip\u0151cz"
         ],
-        "role-head": "Documentation infrastructure maintainer",
+        "role-head": "Core infrastructure maintainer",
         "responsibilities": {
-            "description": "Maintain the <a href='http://docs.astropy.org/en/stable/index.html'>Astropy documentation</a> website, including:",
+            "description": "Lead development and maintenance of the documentation and testing infrastructure (also see <a href='https://github.com/astropy/astropy-project/tree/main/infrastructure'>infrastructure</a>) for Astropy and the helpers, including:",
             "details": [
                 "Managing the Sphinx infrastructure",
                 "Implementing changes and improvements to the documentation website",
-                "Overseeing content (although primary responsibility for content lies with subpackage maintainers)"
+                "Overseeing content (although primary responsibility for content lies with subpackage maintainers)",
+                "Managing issues/pull request for the Astropy core package regarding testing infrastructure",
+                "Managing issues/pull requests in the repositories containing the testing plugins, and determining when new plugins are required",
+                "Set up and maintain continuous integration services",
+                "Maintaining the 'metapackage' with the testing machinery (pytest-astropy at the time of this writing)",
+                "Supporting and enabling affiliated package usage of the testing infrastructure"
             ]
         }
     },
@@ -312,26 +317,6 @@
             ]
         }
     },
-    {
-        "role": "Testing infrastructure maintainer",
-        "url": "Testing_infrastructure_maintainer",
-        "people": [
-            "Simon Conseil",
-            "Pey Lian Lim",
-            "Thomas Robitaille",
-            "Brigitta Sip\u0151cz"
-        ],
-        "role-head": "Testing infrastructure maintainer",
-        "responsibilities": {
-            "description": "Lead development and maintenance of the testing infrastructure for Astropy and the helpers, including:",
-            "details": [
-                "Managing issues/pull request for the Astropy core package regarding testing infrastructure",
-                "Managing issues/pull requests in the repositories containing the testing plugins, and determining when new plugins are required",
-                "Maintaining the 'metapackage' with the testing machinery (pytest-astropy at the time of this writing)",
-                "Supporting and enabling affiliated package usage of the testing infrastructure"
-            ]
-        }
-    },
     {
         "role": "Package template maintainer",
         "url": "Packagetemplate_maintainer",