diff --git a/assignment2/test.nix b/assignment2/test.nix
index f04cf34..da86f20 100644
--- a/assignment2/test.nix
+++ b/assignment2/test.nix
@@ -1,9 +1,10 @@
 let
-  bash-test = subdir: { runCommandLocal }:
-    runCommandLocal "${subdir}-test" { FLAKE = ../.; }
+  bash-test = subdir: { runCommandLocal, makeWrapper }:
+    runCommandLocal "${subdir}-test" { nativeBuildInputs = [ makeWrapper ]; }
       ''
         mkdir -p $out/bin
-        install ${subdir}/test $out/bin/
+        install ${./${subdir}/test} $out/bin/${subdir}-test
+        wrapProgram "$out/bin/${subdir}-test" --set FLAKE ${../.}
       '';
 in {
   a2-p1 = bash-test "part1";