diff --git a/.github/workflows/flake_evaltests.yml b/.github/workflows/flake_evaltests.yml
index 525d0c05..edfd92b4 100644
--- a/.github/workflows/flake_evaltests.yml
+++ b/.github/workflows/flake_evaltests.yml
@@ -37,4 +37,5 @@ jobs:
       - name: Run Nix Flake Eval Tests
         run: |
           echo 'Flake Eval Tests'
+          nix eval .#checks --show-trace --print-build-logs --verbose
           nix eval .#evalTests --show-trace --print-build-logs --verbose
diff --git a/lib/colmenaSystem.nix b/lib/colmenaSystem.nix
index d628719f..221385ba 100644
--- a/lib/colmenaSystem.nix
+++ b/lib/colmenaSystem.nix
@@ -9,10 +9,10 @@
   tags,
   ssh-user,
   genSpecialArgs,
+  specialArgs ? (genSpecialArgs system),
   ...
 }: let
   inherit (inputs) home-manager;
-  specialArgs = genSpecialArgs system;
 in
   {name, ...}: {
     deployment = {
diff --git a/lib/macosSystem.nix b/lib/macosSystem.nix
index 347c919d..2fd90454 100644
--- a/lib/macosSystem.nix
+++ b/lib/macosSystem.nix
@@ -6,10 +6,10 @@
   myvars,
   system,
   genSpecialArgs,
+  specialArgs ? (genSpecialArgs system),
   ...
 }: let
   inherit (inputs) nixpkgs home-manager nix-darwin;
-  specialArgs = genSpecialArgs system;
 in
   nix-darwin.lib.darwinSystem {
     inherit system specialArgs;
diff --git a/lib/nixosSystem.nix b/lib/nixosSystem.nix
index 8f923cb5..a0b3038d 100644
--- a/lib/nixosSystem.nix
+++ b/lib/nixosSystem.nix
@@ -5,11 +5,11 @@
   genSpecialArgs,
   nixos-modules,
   home-modules ? [],
+  specialArgs ? (genSpecialArgs system),
   myvars,
   ...
 }: let
   inherit (inputs) nixpkgs home-manager nixos-generators;
-  specialArgs = genSpecialArgs system;
 in
   nixpkgs.lib.nixosSystem {
     inherit system specialArgs;
diff --git a/outputs/aarch64-linux/tests/kernel/expected.nix b/outputs/aarch64-linux/tests/kernel/expected.nix
index 2ebb9486..677d30f4 100644
--- a/outputs/aarch64-linux/tests/kernel/expected.nix
+++ b/outputs/aarch64-linux/tests/kernel/expected.nix
@@ -3,6 +3,6 @@
   outputs,
 }: let
   hostsNames = builtins.attrNames outputs.nixosConfigurations;
-  expected = lib.genAttrs hostsNames (_: "aarch64-linux");
+  expected = lib.genAttrs hostsNames (_: true);
 in
   expected
diff --git a/outputs/aarch64-linux/tests/kernel/expr.nix b/outputs/aarch64-linux/tests/kernel/expr.nix
index 478781b0..1e0e72e0 100644
--- a/outputs/aarch64-linux/tests/kernel/expr.nix
+++ b/outputs/aarch64-linux/tests/kernel/expr.nix
@@ -5,5 +5,7 @@
 lib.genAttrs
 (builtins.attrNames outputs.nixosConfigurations)
 (
-  name: outputs.nixosConfigurations.${name}.config.boot.kernelPackages.kernel.system
+  # test only if kernelPackages is set, to avoid build the kernel.
+  # name: outputs.nixosConfigurations.${name}.config.boot.kernelPackages.kernel.system
+  name: outputs.nixosConfigurations.${name}.config.boot.kernelPackages != null
 )
diff --git a/outputs/default.nix b/outputs/default.nix
index 037eff84..862835ee 100644
--- a/outputs/default.nix
+++ b/outputs/default.nix
@@ -53,9 +53,6 @@ in {
   # Add attribute sets into outputs, for debugging
   debugAttrs = {inherit nixosSystems darwinSystems allSystems allSystemNames;};
 
-  # Eval Tests for all NixOS systems.
-  evalTests = lib.lists.all (it: it.evalTests == {}) allSystemValues;
-
   # NixOS Hosts
   nixosConfigurations =
     lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) nixosSystemValues);
@@ -90,8 +87,14 @@ in {
     system: allSystems.${system}.packages or {}
   );
 
+  # Eval Tests for all NixOS & darwin systems.
+  evalTests = lib.lists.all (it: it.evalTests == {}) allSystemValues;
+
   checks = forAllSystems (
     system: {
+      # eval-tests per system
+      eval-tests = allSystems.${system}.evalTests == {};
+
       pre-commit-check = pre-commit-hooks.lib.${system}.run {
         src = mylib.relativeToRoot ".";
         hooks = {