diff --git a/lib/default.nix b/lib/default.nix
index e558bf8..e01b114 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -127,10 +127,13 @@ in rec {
         let
           f = head: input:
             if hasAttr "manifest" input then
-              "${head},${nixpkgs.lib.getName input}=${input.manifest}"
+              ''
+                ${head}, { mapKey = "${
+                  nixpkgs.lib.getName input
+                }", mapValue = ${input.manifest} }''
             else
               abort "${input.pname} does not have a manifest";
-        in (foldl' f "{" inputs) + "}";
+        in (foldl' f "[" inputs) + "]";
     };
 
 }
diff --git a/tests/driver-hw.nix b/tests/driver-hw.nix
index db0d6f9..a41955d 100644
--- a/tests/driver-hw.nix
+++ b/tests/driver-hw.nix
@@ -43,7 +43,7 @@ let
       manifest = lib.mergeManifests (map addManifest (with testPkgs;
         [ base-hw-pc sotest-producer ]
         ++ map genodeSources.depot [ "init" "rtc_drv" ] ++ testInputs));
-      testConfig' = "${./test-wrapper.dhall} ${testConfig} (toMap ${manifest})";
+      testConfig' = "${./test-wrapper.dhall} (${testConfig}) ${manifest}";
       testEnv' = {
         DHALL_GENODE = "${testPkgs.dhallGenode}/source.dhall";
         DHALL_GENODE_TEST = "${./test.dhall}";
diff --git a/tests/driver-linux.nix b/tests/driver-linux.nix
index 4f81077..2aca55b 100644
--- a/tests/driver-linux.nix
+++ b/tests/driver-linux.nix
@@ -34,13 +34,16 @@ let
       '';
     };
 
-  mkTest = { name ? "unamed", testScript, testConfig, testInputs ? [ ]
-    , env ? { }, ... }:
+  defaultScript =
+    ''run_genode_until {child "init" exited with exit value 0} 120'';
+
+  mkTest = { name ? "unamed", testScript ? defaultScript, testConfig
+    , testInputs ? [ ], env ? { }, ... }:
     with testPkgs;
     let
       manifest = lib.mergeManifests (map addManifest
         ((with testPkgs; [ base-linux init sotest-producer ] ++ testInputs)));
-      testConfig' = "${./test-wrapper.dhall} ${testConfig} (toMap ${manifest})";
+      testConfig' = "${./test-wrapper.dhall} (${testConfig}) ${manifest}";
       env' = {
         DHALL_GENODE = "${testPkgs.dhallGenode}/source.dhall";
         DHALL_GENODE_TEST = "${./test.dhall}";
diff --git a/tests/driver-nova.nix b/tests/driver-nova.nix
index 281793f..56e50eb 100644
--- a/tests/driver-nova.nix
+++ b/tests/driver-nova.nix
@@ -43,7 +43,7 @@ let
       manifest = lib.mergeManifests (map addManifest (with testPkgs;
         [ base-nova sotest-producer ]
         ++ map genodeSources.depot [ "init" "rtc_drv" ] ++ testInputs));
-      testConfig' = "${./test-wrapper.dhall} ${testConfig} (toMap ${manifest})";
+      testConfig' = "${./test-wrapper.dhall} (${testConfig}) ${manifest}";
       testEnv' = {
         DHALL_GENODE = "${testPkgs.dhallGenode}/source.dhall";
         DHALL_GENODE_TEST = "${./test.dhall}";