From 9b4eefdf38e39cc354bc1326ad34741483089489 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 13:15:09 +0200
Subject: [PATCH 1/4] nixosTests.zigbee2mqtt: use nspawn container

---
 nixos/tests/zigbee2mqtt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/zigbee2mqtt.nix b/nixos/tests/zigbee2mqtt.nix
index 9f57d1f70ddc..a9e9ff458029 100644
--- a/nixos/tests/zigbee2mqtt.nix
+++ b/nixos/tests/zigbee2mqtt.nix
@@ -6,7 +6,7 @@
 
 {
   name = "zigbee2mqtt";
-  nodes.machine = {
+  containers.machine = {
     systemd.services.dummy-serial = {
       wantedBy = [
         "multi-user.target"

From 043c78f15555726b7a65c9d63b83e2a26155a2e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 13:17:13 +0200
Subject: [PATCH 2/4] nixosTests.evcc: use nspawn container

---
 nixos/tests/evcc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix
index 589c8b55843c..24afd1671c8e 100644
--- a/nixos/tests/evcc.nix
+++ b/nixos/tests/evcc.nix
@@ -7,7 +7,7 @@ in
   name = "evcc";
   meta.maintainers = with lib.maintainers; [ hexa ];
 
-  nodes = {
+  containers = {
     machine = {
       services.evcc = {
         enable = true;

From 27c670ba57336d4c2911291062bb232fe153ea9b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 13:18:22 +0200
Subject: [PATCH 3/4] nixosTests.pinnwand: use nspawn container

---
 nixos/tests/pinnwand.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
index e7e62ee7dacc..f14a22f76686 100644
--- a/nixos/tests/pinnwand.nix
+++ b/nixos/tests/pinnwand.nix
@@ -12,7 +12,7 @@ in
     maintainers = [ hexa ];
   };
 
-  nodes = {
+  containers = {
     server =
       { config, ... }:
       {

From fbc588f146aa3dca889d4abfa61fb0bd594b2f5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 13:19:44 +0200
Subject: [PATCH 4/4] nixosTests.postfix-tlspol: use nspawn container

---
 nixos/tests/postfix-tlspol.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix
index d4f9f69d9bb5..d1af9877adb3 100644
--- a/nixos/tests/postfix-tlspol.nix
+++ b/nixos/tests/postfix-tlspol.nix
@@ -7,7 +7,7 @@
 
   meta.maintainers = with lib.maintainers; [ hexa ];
 
-  nodes.machine = {
+  containers.machine = {
     services.postfix.enable = true;
     services.postfix-tlspol.enable = true;