diff --git a/flake.lock b/flake.lock
index f64e3ea37..1d59439da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717432640,
-        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
+        "lastModified": 1721560568,
+        "narHash": "sha256-L61BXz7n/yNzOeZ3FqlnUmxj4145JOVeq9fvQTQzbNM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
+        "rev": "be3ca229c85e978880babdeda9748b14e6aa008f",
         "type": "github"
       },
       "original": {
diff --git a/tests/unit/libexpr/package.nix b/tests/unit/libexpr/package.nix
index 6b7e12c4a..015e3fbc6 100644
--- a/tests/unit/libexpr/package.nix
+++ b/tests/unit/libexpr/package.nix
@@ -1,4 +1,5 @@
 { lib
+, buildPackages
 , stdenv
 , mkMesonDerivation
 , releaseTools
@@ -41,8 +42,6 @@ mkMesonDerivation (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -83,17 +82,21 @@ mkMesonDerivation (finalAttrs: {
   passthru = {
     tests = {
       run = runCommand "${finalAttrs.pname}-run" {
-      } ''
-        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
+        meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
+      } (lib.optionalString stdenv.hostPlatform.isWindows ''
+        export HOME="$PWD/home-dir"
+        mkdir -p "$HOME"
+      '' + ''
         export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
-        nix-expr-tests
+        ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
-      '';
+      '');
     };
   };
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable;
   };
 
 })
diff --git a/tests/unit/libfetchers/package.nix b/tests/unit/libfetchers/package.nix
index 9522f9639..cf75f68e5 100644
--- a/tests/unit/libfetchers/package.nix
+++ b/tests/unit/libfetchers/package.nix
@@ -1,4 +1,5 @@
 { lib
+, buildPackages
 , stdenv
 , mkMesonDerivation
 , releaseTools
@@ -40,8 +41,6 @@ mkMesonDerivation (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -81,17 +80,21 @@ mkMesonDerivation (finalAttrs: {
   passthru = {
     tests = {
       run = runCommand "${finalAttrs.pname}-run" {
-      } ''
-        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
+        meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
+      } (lib.optionalString stdenv.hostPlatform.isWindows ''
+        export HOME="$PWD/home-dir"
+        mkdir -p "$HOME"
+      '' + ''
         export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
-        nix-fetchers-tests
+        ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
-      '';
+      '');
     };
   };
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable;
   };
 
 })
diff --git a/tests/unit/libflake/package.nix b/tests/unit/libflake/package.nix
index 859bc49d0..d2c9fdb89 100644
--- a/tests/unit/libflake/package.nix
+++ b/tests/unit/libflake/package.nix
@@ -1,4 +1,5 @@
 { lib
+, buildPackages
 , stdenv
 , mkMesonDerivation
 , releaseTools
@@ -40,8 +41,6 @@ mkMesonDerivation (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -81,17 +80,21 @@ mkMesonDerivation (finalAttrs: {
   passthru = {
     tests = {
       run = runCommand "${finalAttrs.pname}-run" {
-      } ''
-        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
+        meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
+      } (lib.optionalString stdenv.hostPlatform.isWindows ''
+        export HOME="$PWD/home-dir"
+        mkdir -p "$HOME"
+      '' + ''
         export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
-        nix-flake-tests
+        ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
-      '';
+      '');
     };
   };
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable;
   };
 
 })
diff --git a/tests/unit/libstore/package.nix b/tests/unit/libstore/package.nix
index efffd0063..39bf77585 100644
--- a/tests/unit/libstore/package.nix
+++ b/tests/unit/libstore/package.nix
@@ -1,4 +1,5 @@
 { lib
+, buildPackages
 , stdenv
 , mkMesonDerivation
 , releaseTools
@@ -42,8 +43,6 @@ mkMesonDerivation (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -94,17 +93,22 @@ mkMesonDerivation (finalAttrs: {
             ../../functional/derivation
           ];
         };
-      in runCommand "${finalAttrs.pname}-run" {} ''
-        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
+      in runCommand "${finalAttrs.pname}-run" {
+        meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
+      } (lib.optionalString stdenv.hostPlatform.isWindows ''
+        export HOME="$PWD/home-dir"
+        mkdir -p "$HOME"
+      '' + ''
         export _NIX_TEST_UNIT_DATA=${data + "/unit/libstore/data"}
-        nix-store-tests
+        ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
-      '';
+      '');
     };
   };
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable;
   };
 
 })
diff --git a/tests/unit/libutil/package.nix b/tests/unit/libutil/package.nix
index ad5ff7d1e..c7827e74f 100644
--- a/tests/unit/libutil/package.nix
+++ b/tests/unit/libutil/package.nix
@@ -1,4 +1,5 @@
 { lib
+, buildPackages
 , stdenv
 , mkMesonDerivation
 , releaseTools
@@ -40,8 +41,6 @@ mkMesonDerivation (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -82,17 +81,21 @@ mkMesonDerivation (finalAttrs: {
   passthru = {
     tests = {
       run = runCommand "${finalAttrs.pname}-run" {
-      } ''
-        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
+        meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
+      } (lib.optionalString stdenv.hostPlatform.isWindows ''
+        export HOME="$PWD/home-dir"
+        mkdir -p "$HOME"
+      '' + ''
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-util-tests
+        ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
-      '';
+      '');
     };
   };
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable;
   };
 
 })