diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild
index 3aa3d015..01edbb92 100644
--- a/test/blackbox-tests/jbuild
+++ b/test/blackbox-tests/jbuild
@@ -8,454 +8,454 @@
 
 (alias
  ((name   runtest)
-  (deps   ((files_recursively_in test-cases/redirections)))
+  (deps   ((package jbuilder)
+           (files_recursively_in test-cases/redirections)))
   (action
    (chdir test-cases/redirections
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/misc)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/misc)))
   (action
    (chdir test-cases/misc
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github20)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github20)))
   (action
    (chdir test-cases/github20
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest-js)
-  (deps ((files_recursively_in test-cases/js_of_ocaml)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/js_of_ocaml)))
   (action
    (chdir test-cases/js_of_ocaml
-    (setenv JBUILDER ${bin:jbuilder}
-     (setenv NODE ${bin:node}
-      (progn
-       (run ${exe:cram.exe} run.t)
-       (diff? run.t run.t.corrected))))))))
+    (setenv NODE ${bin:node}
+     (progn
+      (run ${exe:cram.exe} run.t)
+      (diff? run.t run.t.corrected)))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github24)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github24)))
   (action
    (chdir test-cases/github24
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/menhir)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/menhir)))
   (action
    (chdir test-cases/menhir
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github25)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github25)))
   (action
    (chdir test-cases/github25/root
     (setenv OCAMLPATH ../findlib-packages
-     (setenv JBUILDER ${bin:jbuilder}
-      (progn
-       (run ${exe:cram.exe} run.t)
-       (diff? run.t run.t.corrected))))))))
+     (progn
+      (run ${exe:cram.exe} run.t)
+      (diff? run.t run.t.corrected)))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/lib-available)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/lib-available)))
   (action
    (chdir test-cases/lib-available
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/copy_files)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/copy_files)))
   (action
    (chdir test-cases/copy_files
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/aliases)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/aliases)))
   (action
    (chdir test-cases/aliases
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/force-test)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/force-test)))
   (action
    (chdir test-cases/force-test
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/meta-gen)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/meta-gen)))
   (action
    (chdir test-cases/meta-gen
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/exec-cmd)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/exec-cmd)))
   (action
    (chdir test-cases/exec-cmd
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/ocaml-syntax)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/ocaml-syntax)))
   (action
-     (chdir test-cases/ocaml-syntax
-      (setenv JBUILDER ${bin:jbuilder}
-       (progn
-        (run ${exe:cram.exe} run.t)
-        (diff? run.t run.t.corrected)))))))
+   (chdir test-cases/ocaml-syntax
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/gen-opam-install-file)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/gen-opam-install-file)))
   (action
-     (chdir test-cases/gen-opam-install-file
-      (setenv JBUILDER ${bin:jbuilder}
-       (progn
-        (run ${exe:cram.exe} run.t)
-        (diff? run.t run.t.corrected)))))))
+   (chdir test-cases/gen-opam-install-file
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest-skipped)
-  (deps ((files_recursively_in test-cases/reason)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/reason)))
   (action
    (chdir test-cases/reason
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/odoc)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/odoc)))
   (action
    (chdir test-cases/odoc
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/select)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/select)))
   (action
    (chdir test-cases/select
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/multiple-private-libs)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/multiple-private-libs)))
   (action
    (chdir test-cases/multiple-private-libs
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/ppx-rewriter)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/ppx-rewriter)))
   (action
    (chdir test-cases/ppx-rewriter
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/utop)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/utop)))
   (action
    (chdir test-cases/utop
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/c-stubs)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/c-stubs)))
   (action
    (chdir test-cases/c-stubs
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/cross-compilation)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/cross-compilation)))
   (action
    (chdir test-cases/cross-compilation
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/promote)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/promote)))
   (action
    (chdir test-cases/promote
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/include-loop)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/include-loop)))
   (action
    (chdir test-cases/include-loop
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/scope-bug)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/scope-bug)))
   (action
    (chdir test-cases/scope-bug
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/scope-ppx-bug)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/scope-ppx-bug)))
   (action
    (chdir test-cases/scope-ppx-bug
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/loop)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/loop)))
   (action
    (chdir test-cases/loop
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/intf-only)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/intf-only)))
   (action
    (chdir test-cases/intf-only
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/installable-dup-private-libs)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/installable-dup-private-libs)))
   (action
    (chdir test-cases/installable-dup-private-libs
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/inline_tests)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/inline_tests)))
   (action
    (chdir test-cases/inline_tests
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/byte-code-only)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/byte-code-only)))
   (action
    (chdir test-cases/byte-code-only
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/merlin-tests)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/merlin-tests)))
   (action
    (chdir test-cases/merlin-tests
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/findlib)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/findlib)))
   (action
    (chdir test-cases/findlib
     (setenv OCAMLPATH findlib-packages
-     (setenv JBUILDER ${bin:jbuilder}
-      (progn
-       (run ${exe:cram.exe} run.t)
-       (diff? run.t run.t.corrected))))))))
+     (progn
+      (run ${exe:cram.exe} run.t)
+      (diff? run.t run.t.corrected)))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/odoc-unique-mlds)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/odoc-unique-mlds)))
   (action
    (chdir test-cases/odoc-unique-mlds
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/ocamldep-multi-stanzas)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/ocamldep-multi-stanzas)))
   (action
    (chdir test-cases/ocamldep-multi-stanzas
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/exclude-missing-module)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/exclude-missing-module)))
   (action
    (chdir test-cases/exclude-missing-module
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github534)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github534)))
   (action
    (chdir test-cases/github534
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github568)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github568)))
   (action
    (chdir test-cases/github568
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/output-obj)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/output-obj)))
   (action
    (chdir test-cases/output-obj
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions <4.06.0
-       run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions <4.06.0
+      run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github597)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github597)))
   (action
    (chdir test-cases/github597
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/private-public-overlap)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/private-public-overlap)))
   (action
    (chdir test-cases/private-public-overlap
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/depend-on-the-universe)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/depend-on-the-universe)))
   (action
    (chdir test-cases/depend-on-the-universe
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/package-dep)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/package-dep)))
   (action
    (chdir test-cases/package-dep
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
 
 (alias
  ((name runtest)
-  (deps ((files_recursively_in test-cases/github644)))
+  (deps ((package jbuilder)
+         (files_recursively_in test-cases/github644)))
   (action
    (chdir test-cases/github644
-    (setenv JBUILDER ${bin:jbuilder}
-     (progn
-      (run ${exe:cram.exe} run.t)
-      (diff? run.t run.t.corrected)))))))
+    (progn
+     (run ${exe:cram.exe} run.t)
+     (diff? run.t run.t.corrected))))))
diff --git a/test/blackbox-tests/test-cases/aliases/run.t b/test/blackbox-tests/test-cases/aliases/run.t
index e65f8b63..45a7fb6f 100644
--- a/test/blackbox-tests/test-cases/aliases/run.t
+++ b/test/blackbox-tests/test-cases/aliases/run.t
@@ -1,22 +1,22 @@
-  $ $JBUILDER clean -j1 --display short --root .
-  $ $JBUILDER build -j1 --display short --root . @just-in-src
+  $ jbuilder clean -j1 --display short --root .
+  $ jbuilder build -j1 --display short --root . @just-in-src
   running in src
-  $ $JBUILDER clean -j1 --display short --root .
-  $ $JBUILDER build -j1 --display short --root . @everywhere
+  $ jbuilder clean -j1 --display short --root .
+  $ jbuilder build -j1 --display short --root . @everywhere
   running in src/foo/bar
   running in src/foo/baz
   running in src
-  $ $JBUILDER clean -j1 --display short --root .
-  $ $JBUILDER build -j1 --display short --root . @x
+  $ jbuilder clean -j1 --display short --root .
+  $ jbuilder build -j1 --display short --root . @x
   running in src/foo/bar
   running in src/foo/baz
   running in src
-  $ $JBUILDER build -j1 --display short --root . @plop
+  $ jbuilder build -j1 --display short --root . @plop
   From the command line:
   Error: Alias plop is empty.
   It is not defined in . or any of its descendants.
   [1]
-  $ $JBUILDER build -j1 --display short --root . @truc/x
+  $ jbuilder build -j1 --display short --root . @truc/x
   From the command line:
   Error: Don't know about directory truc!
   [1]
diff --git a/test/blackbox-tests/test-cases/byte-code-only/run.t b/test/blackbox-tests/test-cases/byte-code-only/run.t
index 0e82eeb0..7592d88a 100644
--- a/test/blackbox-tests/test-cases/byte-code-only/run.t
+++ b/test/blackbox-tests/test-cases/byte-code-only/run.t
@@ -1,4 +1,4 @@
-  $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" $JBUILDER build --root . -j1 --display short
+  $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short
       ocamldep bin/toto.ml.d
         ocamlc bin/.toto.eobjs/toto.{cmi,cmo,cmt}
         ocamlc bin/toto.exe
@@ -7,6 +7,6 @@
         ocamlc src/foo.cma
 
 Check that building a native only executable fails
-  $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" $JBUILDER build --root . -j1 --display short native-only/foo.exe
+  $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short native-only/foo.exe
   Don't know how to build native-only/foo.exe
   [1]
diff --git a/test/blackbox-tests/test-cases/c-stubs/run.t b/test/blackbox-tests/test-cases/c-stubs/run.t
index 78d5c311..33db944a 100644
--- a/test/blackbox-tests/test-cases/c-stubs/run.t
+++ b/test/blackbox-tests/test-cases/c-stubs/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER exec -j1 ./qnativerun/run.exe --display short --root .
+  $ jbuilder exec -j1 ./qnativerun/run.exe --display short --root .
       ocamldep qnativerun/run.ml.d
         ocamlc q/q_stub.o
     ocamlmklib q/dllq_stubs.so,q/libq_stubs.a
@@ -11,4 +11,4 @@
       ocamlopt qnativerun/.run.eobjs/run.{cmx,o}
       ocamlopt qnativerun/run.exe
   42
-#  $ $JBUILDER exec -j1 ./qbyterun/run.bc --display short --root .
+#  $ jbuilder exec -j1 ./qbyterun/run.bc --display short --root .
diff --git a/test/blackbox-tests/test-cases/copy_files/run.t b/test/blackbox-tests/test-cases/copy_files/run.t
index 3e11d4d3..919231ff 100644
--- a/test/blackbox-tests/test-cases/copy_files/run.t
+++ b/test/blackbox-tests/test-cases/copy_files/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 test.exe .merlin --display short --root . --debug-dependency-path
+  $ jbuilder build -j1 test.exe .merlin --display short --root . --debug-dependency-path
       ocamllex lexers/lexer1.ml
       ocamldep lexer1.ml.d
       ocamldep test.ml.d
@@ -13,6 +13,6 @@
       ocamlopt .test.eobjs/test.{cmx,o}
       ocamlopt foo.{a,cmxa}
       ocamlopt test.exe
-  $ $JBUILDER build -j1 @bar-source --display short --root .
+  $ jbuilder build -j1 @bar-source --display short --root .
   #line 1 "include/bar.h"
   int foo () {return 42;}
diff --git a/test/blackbox-tests/test-cases/cross-compilation/run.t b/test/blackbox-tests/test-cases/cross-compilation/run.t
index a4d2c6b1..b44e1e30 100644
--- a/test/blackbox-tests/test-cases/cross-compilation/run.t
+++ b/test/blackbox-tests/test-cases/cross-compilation/run.t
@@ -1,4 +1,4 @@
-  $ env OCAMLFIND_CONF=$PWD/etc/findlib.conf $JBUILDER build --display short --root . -j1 -x foo file @install
+  $ env OCAMLFIND_CONF=$PWD/etc/findlib.conf jbuilder build --display short --root . -j1 -x foo file @install
       ocamldep bin/blah.ml.d [default.foo]
       ocamldep lib/p.ml.d [default.foo]
         ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo]
diff --git a/test/blackbox-tests/test-cases/depend-on-the-universe/run.t b/test/blackbox-tests/test-cases/depend-on-the-universe/run.t
index 3b51b455..99bd644e 100644
--- a/test/blackbox-tests/test-cases/depend-on-the-universe/run.t
+++ b/test/blackbox-tests/test-cases/depend-on-the-universe/run.t
@@ -1,10 +1,10 @@
-  $ $JBUILDER build --root . -j 1 --display quiet @x
+  $ jbuilder build --root . -j 1 --display quiet @x
   Hello, world!
-  $ $JBUILDER build --root . -j 1 --display quiet @x
+  $ jbuilder build --root . -j 1 --display quiet @x
   Hello, world!
-  $ $JBUILDER build --root . -j 1 --display quiet @x
+  $ jbuilder build --root . -j 1 --display quiet @x
   Hello, world!
-  $ $JBUILDER build --root . -j 1 --display quiet @x
+  $ jbuilder build --root . -j 1 --display quiet @x
   Hello, world!
-  $ $JBUILDER build --root . -j 1 --display quiet @x
+  $ jbuilder build --root . -j 1 --display quiet @x
   Hello, world!
diff --git a/test/blackbox-tests/test-cases/exclude-missing-module/run.t b/test/blackbox-tests/test-cases/exclude-missing-module/run.t
index 6fb68f3d..61014571 100644
--- a/test/blackbox-tests/test-cases/exclude-missing-module/run.t
+++ b/test/blackbox-tests/test-cases/exclude-missing-module/run.t
@@ -1,3 +1,3 @@
-  $ $JBUILDER build --display short --root . -j 1
+  $ jbuilder build --display short --root . -j 1
   File "jbuild", line 3, characters 24-28:
   Warning: Module Fake is excluded but it doesn't exist.
diff --git a/test/blackbox-tests/test-cases/exec-cmd/run.t b/test/blackbox-tests/test-cases/exec-cmd/run.t
index 834cc095..ec101394 100644
--- a/test/blackbox-tests/test-cases/exec-cmd/run.t
+++ b/test/blackbox-tests/test-cases/exec-cmd/run.t
@@ -1,22 +1,22 @@
-  $ $JBUILDER clean -j1 --display short --root .
-  $ $JBUILDER exec --no-build ./foo.exe -j1 --display short --root .
+  $ jbuilder clean -j1 --display short --root .
+  $ jbuilder exec --no-build ./foo.exe -j1 --display short --root .
   Error: Program "./foo.exe" isn't built yet you need to buid it first or remove the --no-build option.
   [1]
-  $ $JBUILDER exec ./foo.exe -j1 --display short --root .
+  $ jbuilder exec ./foo.exe -j1 --display short --root .
       ocamldep foo.ml.d
         ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
       ocamlopt .foo.eobjs/foo.{cmx,o}
       ocamlopt foo.exe
   Foo
-  $ $JBUILDER exec --dev ./foo.exe -j1 --display short --root .
+  $ jbuilder exec --dev ./foo.exe -j1 --display short --root .
         ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
       ocamlopt .foo.eobjs/foo.{cmx,o}
       ocamlopt foo.exe
   Foo
-  $ $JBUILDER exec dunetestbar --no-build -j1 --display short --root .
+  $ jbuilder exec dunetestbar --no-build -j1 --display short --root .
   Error: Program "dunetestbar" isn't built yet you need to buid it first or remove the --no-build option.
   [1]
-  $ $JBUILDER exec dunetestbar -j1 --display short --root .
+  $ jbuilder exec dunetestbar -j1 --display short --root .
       ocamldep bar.ml.d
         ocamlc .bar.eobjs/bar.{cmi,cmo,cmt}
       ocamlopt .bar.eobjs/bar.{cmx,o}
diff --git a/test/blackbox-tests/test-cases/findlib/run.t b/test/blackbox-tests/test-cases/findlib/run.t
index 35b0aef7..c29eba1d 100644
--- a/test/blackbox-tests/test-cases/findlib/run.t
+++ b/test/blackbox-tests/test-cases/findlib/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER external-lib-deps --root . -j1 --display quiet @install
+  $ jbuilder external-lib-deps --root . -j1 --display quiet @install
   These are the external library dependencies in the default context:
   - a
   - b
@@ -6,7 +6,7 @@
 
 Reproduction case for #484. The error should point to src/jbuild
 
-  $ $JBUILDER build --root . -j1 --display quiet @install
+  $ jbuilder build --root . -j1 --display quiet @install
   File "src/jbuild", line 4, characters 16-17:
   Error: Library "a" not found.
   Hint: try: jbuilder external-lib-deps --missing --root . @install
diff --git a/test/blackbox-tests/test-cases/force-test/run.t b/test/blackbox-tests/test-cases/force-test/run.t
index c5fb239f..97172b6a 100644
--- a/test/blackbox-tests/test-cases/force-test/run.t
+++ b/test/blackbox-tests/test-cases/force-test/run.t
@@ -1,12 +1,12 @@
-  $ $JBUILDER clean -j1 --display short --root .
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder clean -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
       ocamldep f.ml.d
         ocamlc .f.eobjs/f.{cmi,cmo,cmt}
       ocamlopt .f.eobjs/f.{cmx,o}
       ocamlopt f.exe
              f alias runtest
   Foo Bar
-  $ $JBUILDER runtest -j1 --display short --root .
-  $ $JBUILDER runtest --force -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
+  $ jbuilder runtest --force -j1 --display short --root .
              f alias runtest
   Foo Bar
diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
index c32ceab7..0fd2f121 100644
--- a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
+++ b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
       ocamldep bar.ml.d
       ocamldep foo_byte.ml.d
         ocamlc .foo_byte.objs/foo_byte.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/github20/run.t b/test/blackbox-tests/test-cases/github20/run.t
index 5c5ceddb..454c7fb9 100644
--- a/test/blackbox-tests/test-cases/github20/run.t
+++ b/test/blackbox-tests/test-cases/github20/run.t
@@ -1 +1 @@
-  $ $JBUILDER build -j1 .merlin --display short --root .
+  $ jbuilder build -j1 .merlin --display short --root .
diff --git a/test/blackbox-tests/test-cases/github24/run.t b/test/blackbox-tests/test-cases/github24/run.t
index 1f425e30..31620326 100644
--- a/test/blackbox-tests/test-cases/github24/run.t
+++ b/test/blackbox-tests/test-cases/github24/run.t
@@ -1 +1 @@
-  $ $JBUILDER build -j1 @install --display short --root . --debug-dependency-path
+  $ jbuilder build -j1 @install --display short --root . --debug-dependency-path
diff --git a/test/blackbox-tests/test-cases/github25/root/run.t b/test/blackbox-tests/test-cases/github25/root/run.t
index 36ec6720..139e9efc 100644
--- a/test/blackbox-tests/test-cases/github25/root/run.t
+++ b/test/blackbox-tests/test-cases/github25/root/run.t
@@ -6,14 +6,14 @@ problem. So jbuilder shouldn't crash because of "plop.ca-marche-pas"
 
 We need ocamlfind to run this test
 
-  $ $JBUILDER build -j1 @install --display short --root . --only hello
+  $ jbuilder build -j1 @install --display short --root . --only hello
         ocamlc .hello.objs/hello.{cmi,cmo,cmt}
       ocamlopt .hello.objs/hello.{cmx,o}
       ocamlopt hello.{a,cmxa}
       ocamlopt hello.cmxs
         ocamlc hello.cma
 
-  $ $JBUILDER build -j1 @install --display short --root . --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../'
+  $ jbuilder build -j1 @install --display short --root . --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../'
       ocamldep a.ml.d
   File ".../plop/META", line 1, characters 0-0:
   Error: Library "une-lib-qui-nexiste-pas" not found.
diff --git a/test/blackbox-tests/test-cases/github534/run.t b/test/blackbox-tests/test-cases/github534/run.t
index 2629210f..35f8450f 100644
--- a/test/blackbox-tests/test-cases/github534/run.t
+++ b/test/blackbox-tests/test-cases/github534/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER exec ./main.exe --root . -j1 --display short
+  $ jbuilder exec ./main.exe --root . -j1 --display short
           echo main.ml
       ocamldep main.ml.d
         ocamlc .main.eobjs/main.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/github568/run.t b/test/blackbox-tests/test-cases/github568/run.t
index e339f7c2..84933d15 100644
--- a/test/blackbox-tests/test-cases/github568/run.t
+++ b/test/blackbox-tests/test-cases/github568/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest --display short -j1 -p lib1 --debug-dependency-path
+  $ jbuilder runtest --display short -j1 -p lib1 --debug-dependency-path
       ocamldep test1.ml.d
       ocamldep lib1.ml.d
         ocamlc .lib1.objs/lib1.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/github597/run.t b/test/blackbox-tests/test-cases/github597/run.t
index 3ea2a86a..0de71ff8 100644
--- a/test/blackbox-tests/test-cases/github597/run.t
+++ b/test/blackbox-tests/test-cases/github597/run.t
@@ -1 +1 @@
-  $ $JBUILDER build --root . -j1 --display quiet b/b.cma
+  $ jbuilder build --root . -j1 --display quiet b/b.cma
diff --git a/test/blackbox-tests/test-cases/github644/run.t b/test/blackbox-tests/test-cases/github644/run.t
index 0efe6107..2b1b58b3 100644
--- a/test/blackbox-tests/test-cases/github644/run.t
+++ b/test/blackbox-tests/test-cases/github644/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest --root . -j 1 --display quiet
+  $ jbuilder runtest --root . -j 1 --display quiet
   File "jbuild", line 4, characters 20-42:
   Error: Library "ppx_that_doesn't_exist" not found.
   Hint: try: jbuilder external-lib-deps --missing --root . @runtest
@@ -6,6 +6,6 @@
 
 These should print something:
 
-  $ $JBUILDER external-lib-deps --root . -j 1 --display quiet @runtest
+  $ jbuilder external-lib-deps --root . -j 1 --display quiet @runtest
 
-  $ $JBUILDER external-lib-deps --root . -j 1 --display quiet --missing @runtest
+  $ jbuilder external-lib-deps --root . -j 1 --display quiet --missing @runtest
diff --git a/test/blackbox-tests/test-cases/include-loop/run.t b/test/blackbox-tests/test-cases/include-loop/run.t
index 89e6b572..f9c11731 100644
--- a/test/blackbox-tests/test-cases/include-loop/run.t
+++ b/test/blackbox-tests/test-cases/include-loop/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build --display short --root . -j 1
+  $ jbuilder build --display short --root . -j 1
   File "jbuild", line 2, characters 0-15:
   Error: Recursive inclusion of jbuild files detected:
   File a.inc is included from c.inc:2
diff --git a/test/blackbox-tests/test-cases/inline_tests/run.t b/test/blackbox-tests/test-cases/inline_tests/run.t
index 20bf5688..4a583a85 100644
--- a/test/blackbox-tests/test-cases/inline_tests/run.t
+++ b/test/blackbox-tests/test-cases/inline_tests/run.t
@@ -1,26 +1,26 @@
-  $ env -u OCAMLRUNPARAM $JBUILDER runtest simple -j1 --display quiet --root .
+  $ env -u OCAMLRUNPARAM jbuilder runtest simple -j1 --display quiet --root .
            run alias simple/runtest (exit 2)
   (cd _build/default/simple && ./.foo_simple.inline-tests/run.exe)
   Fatal error: exception File "simple/.foo_simple.inline-tests/run.ml", line 1, characters 10-16: Assertion failed
   [1]
 
-  $ $JBUILDER runtest missing-backend -j1 --display quiet --root .
+  $ jbuilder runtest missing-backend -j1 --display quiet --root .
   File "missing-backend/jbuild", line 3, characters 2-16:
   Error: No inline tests backend found.
   [1]
 
-  $ $JBUILDER runtest too-many-backends -j1 --display quiet --root .
+  $ jbuilder runtest too-many-backends -j1 --display quiet --root .
   File "too-many-backends/jbuild", line 17, characters 2-16:
   Error: Too many independant inline tests backends found:
   - "backend_tmb1" in _build/default/too-many-backends
   - "backend_tmb2" in _build/default/too-many-backends
   [1]
 
-  $ $JBUILDER runtest many-backends-choose -j1 --display quiet --root .
+  $ jbuilder runtest many-backends-choose -j1 --display quiet --root .
            run alias many-backends-choose/runtest
   backend_mbc1
 
-  $ $JBUILDER runtest dune-file -j1 --display quiet --root .
+  $ jbuilder runtest dune-file -j1 --display quiet --root .
   (dune
    1
    ((inline_tests.backend
diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t b/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t
index 53b4fe20..3636c25b 100644
--- a/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t
+++ b/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build @install -j1 --display short --root .
+  $ jbuilder build @install -j1 --display short --root .
       ocamldep a1/a.ml.d
         ocamlc a1/.a.objs/a.{cmi,cmo,cmt}
       ocamlopt a1/.a.objs/a.{cmx,o}
diff --git a/test/blackbox-tests/test-cases/intf-only/run.t b/test/blackbox-tests/test-cases/intf-only/run.t
index 0673a5f8..0215a48c 100644
--- a/test/blackbox-tests/test-cases/intf-only/run.t
+++ b/test/blackbox-tests/test-cases/intf-only/run.t
@@ -1,6 +1,6 @@
 Successes:
 
-  $ $JBUILDER build --display short --root foo -j1 --debug-dep 2>&1 | grep -v Entering
+  $ jbuilder build --display short --root foo -j1 --debug-dep 2>&1 | grep -v Entering
       ocamldep test/bar.ml.d
       ocamldep foo.ml.d
         ocamlc .foo.objs/foo__.{cmi,cmo,cmt}
@@ -20,7 +20,7 @@ Successes:
 
 Errors:
 
-  $ $JBUILDER build --display short --root a -j1 foo.cma 2>&1 | grep -v Entering
+  $ jbuilder build --display short --root a -j1 foo.cma 2>&1 | grep -v Entering
   File "jbuild", line 2, characters 1-13:
   Warning: Some modules don't have an implementation.
   You need to add the following field to this stanza:
@@ -30,16 +30,16 @@ Errors:
   This will become an error in the future.
         ocamlc .foo.objs/foo.{cmi,cmo,cmt}
         ocamlc foo.cma
-  $ $JBUILDER build --display short --root b -j1 foo.cma 2>&1 | grep -v Entering
+  $ jbuilder build --display short --root b -j1 foo.cma 2>&1 | grep -v Entering
   File "jbuild", line 3, characters 34-37:
   Warning: The following modules must be listed here as they don't have an implementation:
   - y
   This will become an error in the future.
         ocamlc .foo.objs/foo.{cmi,cmo,cmt}
         ocamlc foo.cma
-  $ $JBUILDER build --display short --root c -j1 foo.cma 2>&1 | grep -v Entering
+  $ jbuilder build --display short --root c -j1 foo.cma 2>&1 | grep -v Entering
   File "jbuild", line 3, characters 35-36:
   Error: Module X doesn't exist.
-  $ $JBUILDER build --display short --root d -j1 foo.cma 2>&1 | grep -v Entering
+  $ jbuilder build --display short --root d -j1 foo.cma 2>&1 | grep -v Entering
   File "jbuild", line 3, characters 35-36:
   Error: Module X has an implementation, it cannot be listed here
diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/run.t b/test/blackbox-tests/test-cases/js_of_ocaml/run.t
index 126bb68f..5410874e 100644
--- a/test/blackbox-tests/test-cases/js_of_ocaml/run.t
+++ b/test/blackbox-tests/test-cases/js_of_ocaml/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js
+  $ jbuilder build -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js
         ocamlc lib/stubs.o
     ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a
       ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe
@@ -34,7 +34,7 @@
   use it
   break it
   fix it
-  $ $JBUILDER build -j1 --display short --root . bin/technologic.bc.js @install
+  $ jbuilder build -j1 --display short --root . bin/technologic.bc.js @install
         ocamlc lib/.x.objs/x__.{cmi,cmo,cmt}
         ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt}
         ocamlc lib/.x.objs/x.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/lib-available/run.t b/test/blackbox-tests/test-cases/lib-available/run.t
index 2cca2062..e69a8c0e 100644
--- a/test/blackbox-tests/test-cases/lib-available/run.t
+++ b/test/blackbox-tests/test-cases/lib-available/run.t
@@ -1,3 +1,3 @@
-  $ $JBUILDER build -j1 @runtest --display short --root . --debug-dependency-path 2>&1 | sed "s/ cmd /  sh /"
+  $ jbuilder build -j1 @runtest --display short --root . --debug-dependency-path 2>&1 | sed "s/ cmd /  sh /"
             sh alias runtest
             sh alias runtest
diff --git a/test/blackbox-tests/test-cases/loop/run.t b/test/blackbox-tests/test-cases/loop/run.t
index fb353707..ece4f370 100644
--- a/test/blackbox-tests/test-cases/loop/run.t
+++ b/test/blackbox-tests/test-cases/loop/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build --display short --root . -j 1 a
+  $ jbuilder build --display short --root . -j 1 a
           true x
           true y
   Dependency cycle between the following files:
@@ -11,14 +11,14 @@ This second example is slightly more complicated as we request result1
 but the cycle doesn't involve result1. We must make sure the output
 does show a cycle.
 
-  $ $JBUILDER build --display short --root . -j 1 result1
+  $ jbuilder build --display short --root . -j 1 result1
   Dependency cycle between the following files:
       _build/default/result2
   --> _build/default/input
   --> _build/default/result2
   [1]
 
-  $ $JBUILDER build --display short --root . -j 1 result1 --debug-dependency-path
+  $ jbuilder build --display short --root . -j 1 result1 --debug-dependency-path
   Dependency cycle between the following files:
       _build/default/result2
   --> _build/default/input
diff --git a/test/blackbox-tests/test-cases/menhir/run.t b/test/blackbox-tests/test-cases/menhir/run.t
index a7768ca2..0e30bb67 100644
--- a/test/blackbox-tests/test-cases/menhir/run.t
+++ b/test/blackbox-tests/test-cases/menhir/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 src/test.exe --display short --root . --debug-dependency-path
+  $ jbuilder build -j1 src/test.exe --display short --root . --debug-dependency-path
       ocamllex src/lexer1.ml
       ocamldep src/lexer1.ml.d
       ocamllex src/lexer2.ml
diff --git a/test/blackbox-tests/test-cases/merlin-tests/run.t b/test/blackbox-tests/test-cases/merlin-tests/run.t
index 491098c6..3034a6fc 100644
--- a/test/blackbox-tests/test-cases/merlin-tests/run.t
+++ b/test/blackbox-tests/test-cases/merlin-tests/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build @print-merlins -j1 --display short --root .
+  $ jbuilder build @print-merlins -j1 --display short --root .
       ocamldep sanitize-dot-merlin/sanitize_dot_merlin.ml.d
         ocamlc sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmi,cmo,cmt}
       ocamlopt sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmx,o}
diff --git a/test/blackbox-tests/test-cases/meta-gen/run.t b/test/blackbox-tests/test-cases/meta-gen/run.t
index bf5d1d34..28d7fbd3 100644
--- a/test/blackbox-tests/test-cases/meta-gen/run.t
+++ b/test/blackbox-tests/test-cases/meta-gen/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest --force -j1 --display short --root .
+  $ jbuilder runtest --force -j1 --display short --root .
   description = "contains \"quotes\""
   requires = "bytes"
   archive(byte) = "foobar.cma"
diff --git a/test/blackbox-tests/test-cases/misc/run.t b/test/blackbox-tests/test-cases/misc/run.t
index d616ce23..8f3f5d1c 100644
--- a/test/blackbox-tests/test-cases/misc/run.t
+++ b/test/blackbox-tests/test-cases/misc/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
   File "jbuild", line 65, characters 21-44:
   Warning: Directory dir-that-doesnt-exist doesn't exist.
           diff alias runtest
diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/run.t b/test/blackbox-tests/test-cases/multiple-private-libs/run.t
index 32182621..46d207f9 100644
--- a/test/blackbox-tests/test-cases/multiple-private-libs/run.t
+++ b/test/blackbox-tests/test-cases/multiple-private-libs/run.t
@@ -1,6 +1,6 @@
 This test checks that there is no clash when two private libraries have the same name
 
-  $ $JBUILDER build -j1 --display short --root . @doc-private
+  $ jbuilder build -j1 --display short --root . @doc-private
       ocamldep a/test.ml.d
         ocamlc a/.test.objs/test.{cmi,cmo,cmt}
           odoc _doc/_odoc/lib/test@a/test.odoc
diff --git a/test/blackbox-tests/test-cases/ocaml-syntax/run.t b/test/blackbox-tests/test-cases/ocaml-syntax/run.t
index 6feef288..31848275 100644
--- a/test/blackbox-tests/test-cases/ocaml-syntax/run.t
+++ b/test/blackbox-tests/test-cases/ocaml-syntax/run.t
@@ -1,2 +1,2 @@
-  $ $JBUILDER runtest --force -j1 --display short --root .
+  $ jbuilder runtest --force -j1 --display short --root .
   ocaml syntax
diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
index 34e57bbc..bf327660 100644
--- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
+++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER exec ./test.exe -j1 --debug-dep --display short --root .
+  $ jbuilder exec ./test.exe -j1 --debug-dep --display short --root .
   File "jbuild", line 1, characters 0-0:
   Warning: Module "Lib" is used in several stanzas:
   - jbuild:8
@@ -13,7 +13,7 @@
   - <internal location>
   [1]
 
-  $ $JBUILDER build src/a.cma -j1 --debug-dep --display short --root .
+  $ jbuilder build src/a.cma -j1 --debug-dep --display short --root .
   File "src/jbuild", line 1, characters 0-0:
   Warning: Module "X" is used in several stanzas:
   - src/jbuild:4
diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t b/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
index 301920f1..552fab87 100644
--- a/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
+++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
@@ -1,5 +1,5 @@
 Duplicate mld's in the same scope
-  $ $JBUILDER build @doc -j1 --display short --root ./same-scope 2>&1 | grep -v Entering
+  $ jbuilder build @doc -j1 --display short --root ./same-scope 2>&1 | grep -v Entering
           odoc _doc/_html/odoc.css
         ocamlc lib1/.root_lib1.objs/root_lib1.{cmi,cmo,cmt}
           odoc _doc/_odoc/lib/root.lib1/root_lib1.odoc
@@ -12,7 +12,7 @@ Duplicate mld's in the same scope
 
 Duplicate mld's in different scope
   $ rm -rf diff-scope/_build
-  $ $JBUILDER build @doc -j1 --display short --root ./diff-scope 2>&1 | grep -v Entering
+  $ jbuilder build @doc -j1 --display short --root ./diff-scope 2>&1 | grep -v Entering
           odoc _doc/_html/odoc.css
         ocamlc scope1/.scope1.objs/scope1.{cmi,cmo,cmt}
           odoc _doc/_odoc/lib/scope1/scope1.odoc
diff --git a/test/blackbox-tests/test-cases/odoc/run.t b/test/blackbox-tests/test-cases/odoc/run.t
index 95e5c646..643a3501 100644
--- a/test/blackbox-tests/test-cases/odoc/run.t
+++ b/test/blackbox-tests/test-cases/odoc/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build @doc -j1 --display short --root .
+  $ jbuilder build @doc -j1 --display short --root .
       ocamldep bar.ml.d
         ocamlc .bar.objs/bar.{cmi,cmo,cmt}
           odoc _doc/_odoc/lib/bar/bar.odoc
@@ -20,7 +20,7 @@
           odoc _doc/_html/foo/index.html
           odoc _doc/_html/foo/Foo_byte/.jbuilder-keep,_doc/_html/foo/Foo_byte/index.html
           odoc _doc/_html/foo/Foo2/.jbuilder-keep,_doc/_html/foo/Foo2/index.html
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
   <!DOCTYPE html>
   <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -40,7 +40,7 @@
     </body>
   </html>
 
-  $ $JBUILDER build @foo-mld -j1 --display short --root .
+  $ jbuilder build @foo-mld -j1 --display short --root .
   {1 Library foo}
   This library exposes the following toplevel modules:
   {!modules:Foo Foo2}
@@ -48,7 +48,7 @@
   This library exposes the following toplevel modules:
   {!modules:Foo_byte}
 
-  $ $JBUILDER build @bar-mld -j1 --display short --root .
+  $ jbuilder build @bar-mld -j1 --display short --root .
   {1 Library bar}
   This library exposes the following toplevel modules:
   {!modules:Bar}
diff --git a/test/blackbox-tests/test-cases/output-obj/run.t b/test/blackbox-tests/test-cases/output-obj/run.t
index cdbbaa10..b5c5a01d 100644
--- a/test/blackbox-tests/test-cases/output-obj/run.t
+++ b/test/blackbox-tests/test-cases/output-obj/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 --root . --display short @all
+  $ jbuilder build -j1 --root . --display short @all
       ocamldep test.ml.d
         ocamlc .test.eobjs/test.{cmi,cmo,cmt}
         ocamlc test.bc.o
@@ -11,7 +11,7 @@
       ocamlopt test.exe
       ocamlopt test.so
 
-  $ $JBUILDER build -j1 --root . --display quiet @runtest
+  $ jbuilder build -j1 --root . --display quiet @runtest
         static alias runtest
   OK: ./static.bc
        dynamic alias runtest
diff --git a/test/blackbox-tests/test-cases/package-dep/run.t b/test/blackbox-tests/test-cases/package-dep/run.t
index 1a4e219c..53923c70 100644
--- a/test/blackbox-tests/test-cases/package-dep/run.t
+++ b/test/blackbox-tests/test-cases/package-dep/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
       ocamldep bar.ml.d
       ocamldep foo.ml.d
         ocamlc .foo.objs/foo.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/run.t b/test/blackbox-tests/test-cases/ppx-rewriter/run.t
index 7635696a..0861f603 100644
--- a/test/blackbox-tests/test-cases/ppx-rewriter/run.t
+++ b/test/blackbox-tests/test-cases/ppx-rewriter/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build ./w_omp_driver.exe -j1 --display short --root .
+  $ jbuilder build ./w_omp_driver.exe -j1 --display short --root .
       ocamldep ppx/fooppx.ml.d
         ocamlc ppx/.fooppx.objs/fooppx.{cmi,cmo,cmt}
       ocamlopt ppx/.fooppx.objs/fooppx.{cmx,o}
@@ -9,7 +9,7 @@
         ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt}
       ocamlopt .w_omp_driver.eobjs/w_omp_driver.{cmx,o}
       ocamlopt w_omp_driver.exe
-  $ $JBUILDER build ./w_ppx_driver.exe -j1 --display short --root .
+  $ jbuilder build ./w_ppx_driver.exe -j1 --display short --root .
       ocamlopt .ppx/ppx_driver.runner/ppx.exe
            ppx w_ppx_driver.pp.ml
       ocamldep w_ppx_driver.pp.ml.d
@@ -17,4 +17,4 @@
       ocamlopt .w_ppx_driver.eobjs/w_ppx_driver.{cmx,o}
       ocamlopt w_ppx_driver.exe
 This test is broken because ppx_driver doesn't support migrate custom arguments
-#  $ $JBUILDER build ./w_ppx_driver_flags.exe -j1 --display short --root .
+#  $ jbuilder build ./w_ppx_driver_flags.exe -j1 --display short --root .
diff --git a/test/blackbox-tests/test-cases/private-public-overlap/run.t b/test/blackbox-tests/test-cases/private-public-overlap/run.t
index 2cd79085..2002262b 100644
--- a/test/blackbox-tests/test-cases/private-public-overlap/run.t
+++ b/test/blackbox-tests/test-cases/private-public-overlap/run.t
@@ -1,13 +1,13 @@
 public libraries may not have private dependencies
 
-  $ $JBUILDER build -j1 --display short --root private-dep 2>&1 | grep -v Entering
+  $ jbuilder build -j1 --display short --root private-dep 2>&1 | grep -v Entering
   File "jbuild", line 10, characters 14-24:
   Error: Library "privatelib" is private, it cannot be a dependency of a public library.
   You need to give "privatelib" a public name.
       ocamldep publiclib.ml.d
 
 On the other hand, public libraries may have private preprocessors
-  $ $JBUILDER build -j1 --display short --root private-rewriter 2>&1 | grep -v Entering
+  $ jbuilder build -j1 --display short --root private-rewriter 2>&1 | grep -v Entering
         ocamlc .ppx_internal.objs/ppx_internal.{cmi,cmo,cmt}
       ocamlopt .ppx_internal.objs/ppx_internal.{cmx,o}
       ocamlopt ppx_internal.{a,cmxa}
@@ -21,7 +21,7 @@ On the other hand, public libraries may have private preprocessors
         ocamlc mylib.cma
 
 Unless they introduce private runtime dependencies:
-  $ $JBUILDER build -j1 --display short --root private-runtime-deps 2>&1 | grep -v Entering
+  $ jbuilder build -j1 --display short --root private-runtime-deps 2>&1 | grep -v Entering
   File "jbuild", line 16, characters 20-31:
   Error: Library "private_runtime_dep" is private, it cannot be a dependency of a public library.
   You need to give "private_runtime_dep" a public name.
@@ -33,12 +33,12 @@ Unless they introduce private runtime dependencies:
       ocamldep mylib.pp.ml.d
 
 However, public binaries may accept private dependencies
-  $ $JBUILDER build -j1 --display short --root exes 2>&1 | grep -v Entering
+  $ jbuilder build -j1 --display short --root exes 2>&1 | grep -v Entering
       ocamldep publicbin.ml.d
         ocamlc .publicbin.eobjs/publicbin.{cmi,cmo,cmt}
       ocamlopt .publicbin.eobjs/publicbin.{cmx,o}
       ocamlopt publicbin.exe
 
 Private dependencies shouldn't make the library optional
-  $ $JBUILDER build -j1 --display short --root optional 2>&1 | grep -v Entering
+  $ jbuilder build -j1 --display short --root optional 2>&1 | grep -v Entering
   [1]
diff --git a/test/blackbox-tests/test-cases/promote/run.t b/test/blackbox-tests/test-cases/promote/run.t
index 390ebc74..f9e052e6 100644
--- a/test/blackbox-tests/test-cases/promote/run.t
+++ b/test/blackbox-tests/test-cases/promote/run.t
@@ -1,30 +1,30 @@
   $ printf titi > x
 
-  $ $JBUILDER build --display short --root . -j1 --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/'
+  $ jbuilder build --display short --root . -j1 --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/'
             sh (internal) (exit 1)
   DIFF
   $ cat x
   titi
 
-  $ $JBUILDER promote --display short --root .
+  $ jbuilder promote --display short --root .
   Promoting _build/default/x.gen to x.
   $ cat x
   toto
 
-  $ $JBUILDER build --display short --root . -j1 --diff-command false @blah
+  $ jbuilder build --display short --root . -j1 --diff-command false @blah
   $ cat x
   toto
 
 Otherwise this test fails on OSX
-  $ $JBUILDER clean --display short --root . -j1
+  $ jbuilder clean --display short --root . -j1
 
   $ printf titi > x
-  $ $JBUILDER build --display short --root . -j1 --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/'
+  $ jbuilder build --display short --root . -j1 --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/'
             sh (internal) (exit 1)
   DIFF
   Promoting _build/default/x.gen to x.
   $ cat x
   toto
-  $ $JBUILDER build --display short --root . -j1 --diff-command false @blah
+  $ jbuilder build --display short --root . -j1 --diff-command false @blah
   $ cat x
   toto
diff --git a/test/blackbox-tests/test-cases/reason/run.t b/test/blackbox-tests/test-cases/reason/run.t
index 85aa7f36..700a2635 100644
--- a/test/blackbox-tests/test-cases/reason/run.t
+++ b/test/blackbox-tests/test-cases/reason/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build @runtest @install-file -j1 --display short --root .
+  $ jbuilder build @runtest @install-file -j1 --display short --root .
          refmt bar.re.ml
       ocamldep pp/reasononlypp.depends.ocamldep-output
       ocamldep ppx/reasonppx.depends.ocamldep-output
diff --git a/test/blackbox-tests/test-cases/redirections/run.t b/test/blackbox-tests/test-cases/redirections/run.t
index 8a38af12..0bd2b316 100644
--- a/test/blackbox-tests/test-cases/redirections/run.t
+++ b/test/blackbox-tests/test-cases/redirections/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest -j1 --display short --root . 2>&1 | sed "s/ cmd /  sh /"
+  $ jbuilder runtest -j1 --display short --root . 2>&1 | sed "s/ cmd /  sh /"
             sh stderr,stdout
             sh stderr,stdout
           diff alias runtest
diff --git a/test/blackbox-tests/test-cases/scope-bug/run.t b/test/blackbox-tests/test-cases/scope-bug/run.t
index 7ee752c5..f36e9e02 100644
--- a/test/blackbox-tests/test-cases/scope-bug/run.t
+++ b/test/blackbox-tests/test-cases/scope-bug/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 --display short --root . @install
+  $ jbuilder build -j1 --display short --root . @install
       ocamldep alib/alib.ml.d
       ocamldep alib/main.ml.d
         ocamlc alib/.alib.objs/alib__.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
index 32dfc95c..af1e0a4f 100644
--- a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
+++ b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER build -j1 --display short --root . @install --debug-dep
+  $ jbuilder build -j1 --display short --root . @install --debug-dep
         ocamlc a/ppx/.a.objs/a.{cmi,cmo,cmt}
       ocamlopt a/ppx/.a.objs/a.{cmx,o}
       ocamlopt a/ppx/a.{a,cmxa}
diff --git a/test/blackbox-tests/test-cases/select/run.t b/test/blackbox-tests/test-cases/select/run.t
index 123666aa..8db3b6ce 100644
--- a/test/blackbox-tests/test-cases/select/run.t
+++ b/test/blackbox-tests/test-cases/select/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER runtest -j1 --display short --root .
+  $ jbuilder runtest -j1 --display short --root .
       ocamldep bar.ml.d
       ocamldep bar_no_unix.ml.d
       ocamldep bar_unix.ml.d
diff --git a/test/blackbox-tests/test-cases/utop/run.t b/test/blackbox-tests/test-cases/utop/run.t
index fe75da9d..266b48a2 100644
--- a/test/blackbox-tests/test-cases/utop/run.t
+++ b/test/blackbox-tests/test-cases/utop/run.t
@@ -1,4 +1,4 @@
-  $ $JBUILDER utop -j1 --display short --root . forutop -- init_forutop.ml
+  $ jbuilder utop -j1 --display short --root . forutop -- init_forutop.ml
       ocamldep forutop/.utop/utop.ml.d
       ocamldep forutop/forutop.ml.d
         ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}