2 files changed, 31 insertions, 3 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index 7faf99dc0d8..cd2bbd985db 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -333,6 +333,17 @@ guix/import/pypi\.scm                              @guix/python
 guix/scripts/import/pypi\.scm                      @guix/python
 tests/import/pypi\.scm                             @guix/python
 
+gnu/ci\.scm                                        @guix/qa-packages
+gnu/packages/benchmark\.scm                        @guix/qa-packages
+gnu/packages/check\.scm                            @guix/qa-packages
+gnu/packages/ci\.scm                               @guix/qa-packages
+gnu/packages/code\.scm                             @guix/qa-packages
+gnu/packages/debug\.scm                            @guix/qa-packages
+gnu/packages/dezyne\.scm                           @guix/qa-packages
+gnu/packages/libunwind\.scm                        @guix/qa-packages
+gnu/services/ci\.scm                               @guix/qa-packages
+gnu/tests/ci\.scm                                  @guix/qa-packages
+
 gnu/packages/qt\.scm                               @guix/qt
 guix/build-system/qt\.scm                          @guix/qt
 guix/build/qt-build-system\.scm                    @guix/qt
diff --git a/etc/teams.scm b/etc/teams.scm
index ac0e81c3997..860ac5f15e4 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -954,6 +954,23 @@ perl-build-system as well as the rakudo-build-system."
               "guix/scripts/import/pypi.scm"
               "tests/import/pypi.scm")))
 
+(define-team qa-packages
+  (team 'qa-packages
+        #:name "Team for quality assurance packages"
+        #:description
+        "Quality assurance software (CI/CD, testing, analysis;
+no direct relation to Guix's QA)."
+        #:scope (list "gnu/ci.scm"
+                      "gnu/packages/benchmark.scm"
+                      "gnu/packages/check.scm"
+                      "gnu/packages/ci.scm"
+                      "gnu/packages/code.scm"
+                      "gnu/packages/debug.scm"
+                      "gnu/packages/dezyne.scm"
+                      "gnu/packages/libunwind.scm"
+                      "gnu/services/ci.scm"
+                      "gnu/tests/ci.scm")))
+
 (define-team qt
   (team 'qt
         #:name "Qt team"
@@ -1232,7 +1249,7 @@ the \"texlive\" importer."
 (define-member (person "Liliana Marie Prikler"
                        "liliana.prikler@gmail.com"
                        "lilyp")
-  emacs games gnome)
+  emacs games gnome qa-packages)
 
 (define-member (person "Ricardo Wurmus"
                        "rekado@elephly.net"
@@ -1352,7 +1369,7 @@ the \"texlive\" importer."
 (define-member (person "Janneke Nieuwenhuizen"
                        "janneke@gnu.org"
                        "janneke")
-  bootstrap core-packages home hurd installer)
+  bootstrap core-packages home hurd installer qa-packages)
 
 (define-member (person "Ian Eure"
                        "ian@retrospec.tv"
@@ -1471,7 +1488,7 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                        "cnx@loang.net"
                        "cnx")
-  python sysadmin)
+  python qa-packages sysadmin)
 
 (define-member (person "Lilah Tascheter"
                        "lilah@lunabee.space"