diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3e400816da6f..b57847decb323 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5,7 +5,7 @@
  * to merges. Please use the full-text search of your editor. ;)
  * Hint: ### starts category names.
  */
-{ lib, noSysDirs, config}:
+{ lib, noSysDirs, config }:
 self: pkgs:
 
 with pkgs;
@@ -75,8 +75,7 @@ with pkgs;
 
   nixosTests =
     let
-      # TODO(Ericson2314,ekleog): Check this will work correctly with cross-
-      system = builtins.currentSystem;
+      system = hostPlatform.system;
       rawTests = (import ../../nixos/release.nix {
         nixpkgs = pkgs;
       }).tests;