diff --git a/lwt.opam b/lwt.opam
index a8b3d3972..6a8485953 100644
--- a/lwt.opam
+++ b/lwt.opam
@@ -30,6 +30,26 @@ depends: [
 depopts: ["base-threads" "base-unix" "conf-libev"]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
-  ["dune" "exec" "-p" name "src/unix/config/discover.exe" "--" "--save" "--use-libev" "%{conf-libev:installed}%"]
-  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "exec"
+    "-p"
+    name
+    "src/unix/config/discover.exe"
+    "--"
+    "--save"
+    "--use-libev" {conf-libev:installed}
+  ]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
diff --git a/lwt.opam.template b/lwt.opam.template
index 6ffbf088a..2f5163bde 100644
--- a/lwt.opam.template
+++ b/lwt.opam.template
@@ -1,4 +1,24 @@
 build: [
-  ["dune" "exec" "-p" name "src/unix/config/discover.exe" "--" "--save" "--use-libev" "%{conf-libev:installed}%"]
-  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "exec"
+    "-p"
+    name
+    "src/unix/config/discover.exe"
+    "--"
+    "--save"
+    "--use-libev" {conf-libev:installed}
+  ]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]