diff --git a/release.nix b/release.nix
index cb9e41ca..b432a29d 100644
--- a/release.nix
+++ b/release.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  inherit (release) mapTestOn packagePlatforms pkgs;
+  inherit (release) pkgs;
 
   buildFromConfig = configuration: sel: sel
     (import ./. { inherit nixpkgs configuration system; }).config;
@@ -63,79 +63,67 @@ let
     packageSet = import nixpkgs;
   };
 
-  packageSet = {
-    inherit (pkgs)
-      stdenv bash zsh nix
-      tmux reattach-to-user-namespace
-      nano emacs vim;
-  };
-
   manual = buildFromConfig ({ lib, config, ... }: {
     system.stateVersion = lib.mkDefault config.system.maxStateVersion;
   }) (config: config.system.build.manual);
 
-  jobs = {
-    manualHTML = manual.manualHTML;
-    manpages = manual.manpages;
-    options = manual.optionsJSON;
+in {
+  manualHTML = manual.manualHTML;
+  manpages = manual.manpages;
+  options = manual.optionsJSON;
 
-    examples.hydra = makeSystem ./modules/examples/hydra.nix;
-    examples.lnl = makeSystem ./modules/examples/lnl.nix;
-    examples.simple = makeSystem ./modules/examples/simple.nix;
+  examples.hydra = makeSystem ./modules/examples/hydra.nix;
+  examples.lnl = makeSystem ./modules/examples/lnl.nix;
+  examples.simple = makeSystem ./modules/examples/simple.nix;
 
-    tests.activation-scripts = makeTest ./tests/activation-scripts.nix;
-    tests.autossh = makeTest ./tests/autossh.nix;
-    tests.checks-nix-gc = makeTest ./tests/checks-nix-gc.nix;
-    tests.environment-path = makeTest ./tests/environment-path.nix;
-    tests.environment-terminfo = makeTest ./tests/environment-terminfo.nix;
-    tests.homebrew = makeTest ./tests/homebrew.nix;
-    tests.launchd-daemons = makeTest ./tests/launchd-daemons.nix;
-    tests.launchd-setenv = makeTest ./tests/launchd-setenv.nix;
-    tests.networking-hostname = makeTest ./tests/networking-hostname.nix;
-    tests.networking-networkservices = makeTest ./tests/networking-networkservices.nix;
-    tests.nixpkgs-overlays = makeTest ./tests/nixpkgs-overlays.nix;
-    tests.programs-ssh = makeTest ./tests/programs-ssh.nix;
-    tests.programs-tmux = makeTest ./tests/programs-tmux.nix;
-    tests.programs-zsh = makeTest ./tests/programs-zsh.nix;
-    tests.programs-ssh-empty-known-hosts = makeTest ./tests/programs-ssh-empty-known-hosts.nix;
-    tests.security-pki = makeTest ./tests/security-pki.nix;
-    tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
-    tests.services-activate-system-changed-label-prefix = makeTest ./tests/services-activate-system-changed-label-prefix.nix;
-    tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
-    tests.services-github-runners = makeTest ./tests/services-github-runners.nix;
-    tests.services-lorri = makeTest ./tests/services-lorri.nix;
-    tests.services-nix-daemon = makeTest ./tests/services-nix-daemon.nix;
-    tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix;
-    tests.services-aerospace = makeTest ./tests/services-aerospace.nix;
-    tests.services-dnsmasq = makeTest ./tests/services-dnsmasq.nix;
-    tests.services-eternal-terminal = makeTest ./tests/services-eternal-terminal.nix;
-    tests.services-nix-gc = makeTest ./tests/services-nix-gc.nix;
-    tests.services-nix-optimise = makeTest ./tests/services-nix-optimise.nix;
-    tests.services-nextdns = makeTest ./tests/services-nextdns.nix;
-    tests.services-netdata = makeTest ./tests/services-netdata.nix;
-    tests.services-ofborg = makeTest ./tests/services-ofborg.nix;
-    tests.services-offlineimap = makeTest ./tests/services-offlineimap.nix;
-    tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
-    tests.services-redis = makeTest ./tests/services-redis.nix;
-    tests.services-skhd = makeTest ./tests/services-skhd.nix;
-    tests.services-spacebar = makeTest ./tests/services-spacebar.nix;
-    tests.services-spotifyd = makeTest ./tests/services-spotifyd.nix;
-    tests.services-synapse-bt = makeTest ./tests/services-synapse-bt.nix;
-    tests.services-synergy = makeTest ./tests/services-synergy.nix;
-    tests.services-yabai = makeTest ./tests/services-yabai.nix;
-    tests.services-jankyborders = makeTest ./tests/services-jankyborders.nix;
-    tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
-    tests.system-environment = makeTest ./tests/system-environment.nix;
-    tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
-    tests.system-packages = makeTest ./tests/system-packages.nix;
-    tests.system-path = makeTest ./tests/system-path.nix;
-    tests.system-shells = makeTest ./tests/system-shells.nix;
-    tests.users-groups = makeTest ./tests/users-groups.nix;
-    tests.users-packages = makeTest ./tests/users-packages.nix;
-    tests.fonts = makeTest ./tests/fonts.nix;
-
-  }
-  // (mapTestOn (packagePlatforms packageSet));
-
-in
-  jobs
+  tests.activation-scripts = makeTest ./tests/activation-scripts.nix;
+  tests.autossh = makeTest ./tests/autossh.nix;
+  tests.checks-nix-gc = makeTest ./tests/checks-nix-gc.nix;
+  tests.environment-path = makeTest ./tests/environment-path.nix;
+  tests.environment-terminfo = makeTest ./tests/environment-terminfo.nix;
+  tests.homebrew = makeTest ./tests/homebrew.nix;
+  tests.launchd-daemons = makeTest ./tests/launchd-daemons.nix;
+  tests.launchd-setenv = makeTest ./tests/launchd-setenv.nix;
+  tests.networking-hostname = makeTest ./tests/networking-hostname.nix;
+  tests.networking-networkservices = makeTest ./tests/networking-networkservices.nix;
+  tests.nixpkgs-overlays = makeTest ./tests/nixpkgs-overlays.nix;
+  tests.programs-ssh = makeTest ./tests/programs-ssh.nix;
+  tests.programs-tmux = makeTest ./tests/programs-tmux.nix;
+  tests.programs-zsh = makeTest ./tests/programs-zsh.nix;
+  tests.programs-ssh-empty-known-hosts = makeTest ./tests/programs-ssh-empty-known-hosts.nix;
+  tests.security-pki = makeTest ./tests/security-pki.nix;
+  tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
+  tests.services-activate-system-changed-label-prefix = makeTest ./tests/services-activate-system-changed-label-prefix.nix;
+  tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
+  tests.services-github-runners = makeTest ./tests/services-github-runners.nix;
+  tests.services-lorri = makeTest ./tests/services-lorri.nix;
+  tests.services-nix-daemon = makeTest ./tests/services-nix-daemon.nix;
+  tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix;
+  tests.services-aerospace = makeTest ./tests/services-aerospace.nix;
+  tests.services-dnsmasq = makeTest ./tests/services-dnsmasq.nix;
+  tests.services-eternal-terminal = makeTest ./tests/services-eternal-terminal.nix;
+  tests.services-nix-gc = makeTest ./tests/services-nix-gc.nix;
+  tests.services-nix-optimise = makeTest ./tests/services-nix-optimise.nix;
+  tests.services-nextdns = makeTest ./tests/services-nextdns.nix;
+  tests.services-netdata = makeTest ./tests/services-netdata.nix;
+  tests.services-ofborg = makeTest ./tests/services-ofborg.nix;
+  tests.services-offlineimap = makeTest ./tests/services-offlineimap.nix;
+  tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
+  tests.services-redis = makeTest ./tests/services-redis.nix;
+  tests.services-skhd = makeTest ./tests/services-skhd.nix;
+  tests.services-spacebar = makeTest ./tests/services-spacebar.nix;
+  tests.services-spotifyd = makeTest ./tests/services-spotifyd.nix;
+  tests.services-synapse-bt = makeTest ./tests/services-synapse-bt.nix;
+  tests.services-synergy = makeTest ./tests/services-synergy.nix;
+  tests.services-yabai = makeTest ./tests/services-yabai.nix;
+  tests.services-jankyborders = makeTest ./tests/services-jankyborders.nix;
+  tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
+  tests.system-environment = makeTest ./tests/system-environment.nix;
+  tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
+  tests.system-packages = makeTest ./tests/system-packages.nix;
+  tests.system-path = makeTest ./tests/system-path.nix;
+  tests.system-shells = makeTest ./tests/system-shells.nix;
+  tests.users-groups = makeTest ./tests/users-groups.nix;
+  tests.users-packages = makeTest ./tests/users-packages.nix;
+  tests.fonts = makeTest ./tests/fonts.nix;
+}