diff --git a/nixos/modules/system/activation/lib/test.nix b/nixos/modules/system/activation/lib-test.nix
similarity index 80%
rename from nixos/modules/system/activation/lib/test.nix
rename to nixos/modules/system/activation/lib-test.nix
index 34d55e0bbe62..72039a6921a0 100644
--- a/nixos/modules/system/activation/lib/test.nix
+++ b/nixos/modules/system/activation/lib-test.nix
@@ -10,13 +10,7 @@ let
 
   runTests = stdenv.mkDerivation {
     name = "tests-activation-lib";
-    src = fileset.toSource {
-      root = ./.;
-      fileset = fileset.unions [
-        ./lib.sh
-        ./test.sh
-      ];
-    };
+    src = ./lib;
     buildPhase = ":";
     doCheck = true;
     postUnpack = ''
diff --git a/nixos/modules/system/activation/test.nix b/nixos/modules/system/activation/test.nix
index fe8acb708868..ca399e5aeb4a 100644
--- a/nixos/modules/system/activation/test.nix
+++ b/nixos/modules/system/activation/test.nix
@@ -6,7 +6,7 @@
 }:
 let
   node-forbiddenDependencies-fail = nixos (
-    { ... }:
+    { config, ... }:
     {
       system.forbiddenDependenciesRegexes = [ "-dev$" ];
       environment.etc."dev-dependency" = {
@@ -15,16 +15,22 @@ let
       documentation.enable = false;
       fileSystems."/".device = "ignore-root-device";
       boot.loader.grub.enable = false;
+
+      # Don't do this in an actual config
+      system.stateVersion = config.system.nixos.release;
     }
   );
   node-forbiddenDependencies-succeed = nixos (
-    { ... }:
+    { config, ... }:
     {
       system.forbiddenDependenciesRegexes = [ "-dev$" ];
       system.extraDependencies = [ expect.dev ];
       documentation.enable = false;
       fileSystems."/".device = "ignore-root-device";
       boot.loader.grub.enable = false;
+
+      # Don't do this in an actual config
+      system.stateVersion = config.system.nixos.release;
     }
   );
 in
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d12a0f0d10be..512082e29494 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -200,7 +200,7 @@ in
   activation-bashless-image = runTest ./activation/bashless-image.nix;
   activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
   activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
-  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
+  activation-lib = pkgs.callPackage ../modules/system/activation/lib-test.nix { };
   activation-nix-channel = runTest ./activation/nix-channel.nix;
   activation-nixos-init = runTest ./activation/nixos-init.nix;
   activation-perlless = runTest ./activation/perlless.nix;
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 1e6b39be7eba..1c6c6845a74d 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -18,7 +18,7 @@ in
   name = "kanidm-provisioning-${kanidmPackage.version}";
   meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
 
-  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning;
+  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_7;
 
   nodes.provision =
     { pkgs, lib, ... }:
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index c9fd7bb2a083..dcbabe93cb71 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -21,7 +21,7 @@ in
     oddlama
   ];
 
-  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm;
+  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_7;
 
   nodes.server =
     { pkgs, ... }:
diff --git a/nixos/tests/vm-variant.nix b/nixos/tests/vm-variant.nix
index cc95a3e6ed69..cfd8ef50a46c 100644
--- a/nixos/tests/vm-variant.nix
+++ b/nixos/tests/vm-variant.nix
@@ -6,12 +6,13 @@ let
   evalConfig = import ../lib/eval-config.nix;
 
   nixos = evalConfig {
+    system = null;
     modules = [
       {
         system.stateVersion = "25.05";
         fileSystems."/".device = "/dev/null";
         boot.loader.grub.device = "nodev";
-        nixpkgs.hostPlatform = pkgs.system;
+        nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform.system;
         virtualisation.vmVariant.networking.hostName = "vm";
         virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl";
       }