diff --git a/nixos/tests/blint.nix b/nixos/tests/blint.nix
index cf66da6ab93c..ea0a14cb4b1f 100644
--- a/nixos/tests/blint.nix
+++ b/nixos/tests/blint.nix
@@ -7,10 +7,12 @@
 {
   name = "owasp blint test";
 
-  meta.maintainers = with lib; [
-    maintainers.ethancedwards8
-    teams.ngi
-  ];
+  meta.maintainers =
+    with lib;
+    [
+      maintainers.ethancedwards8
+    ]
+    ++ teams.ngi.members;
 
   nodes.machine = {
     environment.systemPackages = with pkgs; [
diff --git a/nixos/tests/corteza.nix b/nixos/tests/corteza.nix
index 514bb5339fc8..35b19a74ef9b 100644
--- a/nixos/tests/corteza.nix
+++ b/nixos/tests/corteza.nix
@@ -4,7 +4,7 @@ let
 in
 {
   name = "corteza";
-  meta.maintainers = [ lib.teams.ngi.members ];
+  meta.maintainers = lib.teams.ngi.members;
 
   nodes.machine = {
     services.corteza = {
diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix
index 82eb6923c5c8..ffb43d85367f 100644
--- a/nixos/tests/dep-scan.nix
+++ b/nixos/tests/dep-scan.nix
@@ -7,10 +7,12 @@
 {
   name = "owasp dep-scan test";
 
-  meta.maintainers = with lib; [
-    maintainers.ethancedwards8
-    teams.ngi
-  ];
+  meta.maintainers =
+    with lib;
+    [
+      maintainers.ethancedwards8
+    ]
+    ++ teams.ngi.members;
 
   nodes.machine = {
     environment.systemPackages = with pkgs; [
diff --git a/nixos/tests/geoserver.nix b/nixos/tests/geoserver.nix
index 3e9416961e90..d432d913523b 100644
--- a/nixos/tests/geoserver.nix
+++ b/nixos/tests/geoserver.nix
@@ -19,7 +19,7 @@ in
 
   name = "geoserver";
   meta = {
-    maintainers = with lib; [ teams.geospatial.members ];
+    maintainers = lib.teams.geospatial.members;
   };
 
   nodes = {
diff --git a/nixos/tests/mitmproxy.nix b/nixos/tests/mitmproxy.nix
index fe571bc430d0..1a3d98d7fcf2 100644
--- a/nixos/tests/mitmproxy.nix
+++ b/nixos/tests/mitmproxy.nix
@@ -9,7 +9,7 @@ let
 in
 {
   name = "mitmproxy";
-  meta.maintainers = [ lib.teams.ngi.members ];
+  meta.maintainers = lib.teams.ngi.members;
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix
index cff589f2807e..78106b61d778 100644
--- a/nixos/tests/nominatim.nix
+++ b/nixos/tests/nominatim.nix
@@ -10,10 +10,7 @@ in
 {
   name = "nominatim";
   meta = {
-    maintainers = with lib.teams; [
-      geospatial.members
-      ngi.members
-    ];
+    maintainers = with lib.teams; geospatial.members ++ ngi.members;
   };
 
   nodes = {
diff --git a/nixos/tests/qgis.nix b/nixos/tests/qgis.nix
index 1a7b75891b96..86e4369756be 100644
--- a/nixos/tests/qgis.nix
+++ b/nixos/tests/qgis.nix
@@ -15,7 +15,7 @@ import ./make-test-python.nix (
   {
     name = "qgis";
     meta = {
-      maintainers = with lib; [ teams.geospatial.members ];
+      maintainers = lib.teams.geospatial.members;
     };
 
     nodes = {