diff --git a/checks/borgbackup/default.nix b/checks/borgbackup/default.nix
index 142b16f31..5c3c8988f 100644
--- a/checks/borgbackup/default.nix
+++ b/checks/borgbackup/default.nix
@@ -16,7 +16,6 @@
             };
           }
           {
-            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
             clan.core.state.testState.folders = [ "/etc/state" ];
             environment.etc.state.text = "hello world";
diff --git a/checks/data-mesher/default.nix b/checks/data-mesher/default.nix
index 636b1ef7f..b693c0b69 100644
--- a/checks/data-mesher/default.nix
+++ b/checks/data-mesher/default.nix
@@ -69,17 +69,14 @@
       imports = serviceConfigs.machines.admin.machineImports;
 
       config.clan.data-mesher.network.tld = "foo";
-      config.clan.core.settings.machine.name = "admin";
     };
 
     peerConfig = {
       imports = serviceConfigs.machines.peer.machineImports;
-      config.clan.core.settings.machine.name = "peer";
     };
 
     signerConfig = {
       imports = serviceConfigs.machines.signer.machineImports;
-      clan.core.settings.machine.name = "signer";
     };
 
   in
diff --git a/checks/deltachat/default.nix b/checks/deltachat/default.nix
index 857132414..afd376845 100644
--- a/checks/deltachat/default.nix
+++ b/checks/deltachat/default.nix
@@ -10,7 +10,6 @@
           self.clanModules.deltachat
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];
diff --git a/checks/matrix-synapse/default.nix b/checks/matrix-synapse/default.nix
index fb8ee4da1..e2379fff6 100644
--- a/checks/matrix-synapse/default.nix
+++ b/checks/matrix-synapse/default.nix
@@ -15,7 +15,6 @@
           self.clanModules.matrix-synapse
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
 
             services.nginx.virtualHosts."matrix.clan.test" = {
diff --git a/checks/mumble/default.nix b/checks/mumble/default.nix
index 7b3382127..912943270 100644
--- a/checks/mumble/default.nix
+++ b/checks/mumble/default.nix
@@ -32,7 +32,6 @@
         imports = [
           common
           {
-            clan.core.settings.machine.name = "peer1";
             environment.etc = {
               "mumble-key".source = ./peer_1/peer_1_test_key;
               "mumble-cert".source = ./peer_1/peer_1_test_cert;
@@ -64,7 +63,6 @@
         imports = [
           common
           {
-            clan.core.settings.machine.name = "peer2";
             environment.etc = {
               "mumble-key".source = ./peer_2/peer_2_test_key;
               "mumble-cert".source = ./peer_2/peer_2_test_cert;
diff --git a/checks/secrets/default.nix b/checks/secrets/default.nix
index e3d542d0d..5665fb3ae 100644
--- a/checks/secrets/default.nix
+++ b/checks/secrets/default.nix
@@ -11,7 +11,6 @@
       sops.age.keyFile = "/etc/privkey.age";
 
       clan.core.settings.directory = "${./.}";
-      clan.core.settings.machine.name = "machine";
 
       networking.hostName = "machine";
     };
diff --git a/checks/syncthing/default.nix b/checks/syncthing/default.nix
index 063498e70..2e4de6cce 100644
--- a/checks/syncthing/default.nix
+++ b/checks/syncthing/default.nix
@@ -12,7 +12,6 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "introducer";
             clan.core.settings.directory = ./.;
             environment.etc = {
               "syncthing.pam".source = ./introducer/introducer_test_cert;
@@ -53,7 +52,6 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "peer1";
             clan.core.settings.directory = ./.;
             clan.syncthing.introducer = lib.strings.removeSuffix "\n" (
               builtins.readFile ./introducer/introducer_device_id
@@ -75,7 +73,6 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "peer2";
             clan.core.settings.directory = ./.;
             clan.syncthing.introducer = lib.strings.removeSuffix "\n" (
               builtins.readFile ./introducer/introducer_device_id
diff --git a/checks/wayland-proxy-virtwl/default.nix b/checks/wayland-proxy-virtwl/default.nix
index 33f57a162..a3e6ddc2d 100644
--- a/checks/wayland-proxy-virtwl/default.nix
+++ b/checks/wayland-proxy-virtwl/default.nix
@@ -14,7 +14,6 @@ import ../lib/test-base.nix (
         imports = [
           self.nixosModules.clanCore
           {
-            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];
diff --git a/checks/zt-tcp-relay/default.nix b/checks/zt-tcp-relay/default.nix
index 93edab62a..ae1991ea9 100644
--- a/checks/zt-tcp-relay/default.nix
+++ b/checks/zt-tcp-relay/default.nix
@@ -10,7 +10,6 @@
           self.nixosModules.clanCore
           self.clanModules.zt-tcp-relay
           {
-            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];
diff --git a/clanModules/mumble/test.nix b/clanModules/mumble/test.nix
index ec18db977..c5b98bf42 100644
--- a/clanModules/mumble/test.nix
+++ b/clanModules/mumble/test.nix
@@ -9,7 +9,6 @@ pkgs.nixosTest {
         self.inputs.clan-core.nixosModules.clanCore
         {
           config = {
-            clan.core.settings.machine.name = "peer1";
             clan.core.settings.directory = ./.;
 
             documentation.enable = false;
@@ -25,11 +24,7 @@ pkgs.nixosTest {
         self.inputs.clan-core.nixosModules.clanCore
         {
           config = {
-
-            clan.core.settings.machine.name = "peer2";
             clan.core.settings.directory = ./.;
-
-            documentation.enable = false;
           };
         }
       ];