diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix
index 97ea8a157b6b..1042eee2e0ab 100644
--- a/nixos/tests/nginx-auth.nix
+++ b/nixos/tests/nginx-auth.nix
@@ -1,7 +1,8 @@
+{ pkgs, ... }:
 {
   name = "nginx-auth";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {
diff --git a/nixos/tests/nginx-etag-compression.nix b/nixos/tests/nginx-etag-compression.nix
index 4604d7c23e64..a194c6fd26b4 100644
--- a/nixos/tests/nginx-etag-compression.nix
+++ b/nixos/tests/nginx-etag-compression.nix
@@ -2,7 +2,7 @@
 {
   name = "nginx-etag-compression";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, lib, ... }:
     {
       services.nginx = {
@@ -28,7 +28,7 @@
     };
 
   testScript =
-    { containers, ... }:
+    { nodes, ... }:
     ''
       machine.wait_for_unit("nginx")
       machine.wait_for_open_port(80)
diff --git a/nixos/tests/nginx-globalredirect.nix b/nixos/tests/nginx-globalredirect.nix
index 2a6d4722114f..ba1c0623593b 100644
--- a/nixos/tests/nginx-globalredirect.nix
+++ b/nixos/tests/nginx-globalredirect.nix
@@ -2,7 +2,7 @@
 {
   name = "nginx-globalredirect";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {
diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix
index 29a191a8d712..5a301f3a06b5 100644
--- a/nixos/tests/nginx-http3.nix
+++ b/nixos/tests/nginx-http3.nix
@@ -13,7 +13,7 @@ builtins.listToAttrs (
         name = "nginx-http3-${pkgs.lib.getName nginxPackage}";
         meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-        containers = {
+        nodes = {
           server =
             { lib, pkgs, ... }:
             {
diff --git a/nixos/tests/nginx-lua.nix b/nixos/tests/nginx-lua.nix
index af4a4a33d4af..8159882a7d5c 100644
--- a/nixos/tests/nginx-lua.nix
+++ b/nixos/tests/nginx-lua.nix
@@ -4,7 +4,7 @@
 
   meta.maintainers = [ lib.maintainers.kranzes ];
 
-  containers.machine = {
+  nodes.machine = {
     services.nginx = {
       enable = true;
       lua = {
diff --git a/nixos/tests/nginx-mime.nix b/nixos/tests/nginx-mime.nix
index 17572eb18286..9752fc01370b 100644
--- a/nixos/tests/nginx-mime.nix
+++ b/nixos/tests/nginx-mime.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   name = "nginx-mime";
   meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-  containers = {
+  nodes = {
     server =
       { pkgs, ... }:
       {
diff --git a/nixos/tests/nginx-modsecurity.nix b/nixos/tests/nginx-modsecurity.nix
index 6f298f055ef6..f6aa58b79859 100644
--- a/nixos/tests/nginx-modsecurity.nix
+++ b/nixos/tests/nginx-modsecurity.nix
@@ -2,7 +2,7 @@
 {
   name = "nginx-modsecurity";
 
-  containers.machine =
+  nodes.machine =
     {
       config,
       lib,
diff --git a/nixos/tests/nginx-moreheaders.nix b/nixos/tests/nginx-moreheaders.nix
index 0f33d3b71e67..446f0ed179e2 100644
--- a/nixos/tests/nginx-moreheaders.nix
+++ b/nixos/tests/nginx-moreheaders.nix
@@ -2,7 +2,7 @@
 {
   name = "nginx-more-headers";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, ... }:
       {
diff --git a/nixos/tests/nginx-njs.nix b/nixos/tests/nginx-njs.nix
index 64955c86f995..a64bbad08e10 100644
--- a/nixos/tests/nginx-njs.nix
+++ b/nixos/tests/nginx-njs.nix
@@ -1,7 +1,8 @@
+{ pkgs, lib, ... }:
 {
   name = "nginx-njs";
 
-  containers.machine =
+  nodes.machine =
     {
       config,
       lib,
diff --git a/nixos/tests/nginx-pubhtml.nix b/nixos/tests/nginx-pubhtml.nix
index 44f88d1a53f8..a8eb87ab3db4 100644
--- a/nixos/tests/nginx-pubhtml.nix
+++ b/nixos/tests/nginx-pubhtml.nix
@@ -2,7 +2,7 @@
 {
   name = "nginx-pubhtml";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, ... }:
     {
       systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
diff --git a/nixos/tests/nginx-redirectcode.nix b/nixos/tests/nginx-redirectcode.nix
index 83d596a6ce29..a48b1021bb80 100644
--- a/nixos/tests/nginx-redirectcode.nix
+++ b/nixos/tests/nginx-redirectcode.nix
@@ -3,7 +3,7 @@
   name = "nginx-redirectcode";
   meta.maintainers = with lib.maintainers; [ misterio77 ];
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {
diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix
index 2d1bd991b643..9926b61ae6a8 100644
--- a/nixos/tests/nginx-sso.nix
+++ b/nixos/tests/nginx-sso.nix
@@ -5,7 +5,7 @@
     maintainers = with pkgs.lib.maintainers; [ ambroisie ];
   };
 
-  containers.machine = {
+  nodes.machine = {
     services.nginx.sso = {
       enable = true;
       configuration = {
diff --git a/nixos/tests/nginx-status-page.nix b/nixos/tests/nginx-status-page.nix
index e273d23b5ff7..312cfadfd4a8 100644
--- a/nixos/tests/nginx-status-page.nix
+++ b/nixos/tests/nginx-status-page.nix
@@ -5,13 +5,12 @@
     maintainers = [ h7x4 ];
   };
 
-  containers = {
+  nodes = {
     webserver =
       { ... }:
       {
         virtualisation.vlans = [ 1 ];
 
-        services.resolved.enable = false;
         networking = {
           useNetworkd = true;
           useDHCP = false;
@@ -37,7 +36,6 @@
       {
         virtualisation.vlans = [ 1 ];
 
-        services.resolved.enable = false;
         networking = {
           useNetworkd = true;
           useDHCP = false;
diff --git a/nixos/tests/nginx-tmpdir.nix b/nixos/tests/nginx-tmpdir.nix
index a05770910102..d9dd2adefdfb 100644
--- a/nixos/tests/nginx-tmpdir.nix
+++ b/nixos/tests/nginx-tmpdir.nix
@@ -5,7 +5,7 @@ in
 {
   name = "nginx-tmpdir";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, ... }:
     {
       environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d";
diff --git a/nixos/tests/nginx-unix-socket.nix b/nixos/tests/nginx-unix-socket.nix
index 693a20d3017f..d6949227d3be 100644
--- a/nixos/tests/nginx-unix-socket.nix
+++ b/nixos/tests/nginx-unix-socket.nix
@@ -6,7 +6,7 @@ in
 {
   name = "nginx-unix-socket";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {
diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix
index b858de483865..a3994ad83247 100644
--- a/nixos/tests/nginx-variants.nix
+++ b/nixos/tests/nginx-variants.nix
@@ -1,4 +1,4 @@
-{ runTest, ... }:
+{ pkgs, runTest, ... }:
 builtins.listToAttrs (
   map
     (packageName: {
@@ -6,7 +6,7 @@ builtins.listToAttrs (
       value = runTest {
         name = "nginx-variant-${packageName}";
 
-        containers.machine =
+        nodes.machine =
           { pkgs, ... }:
           {
             services.nginx = {