diff --git a/tests/test-dirs/ocaml-index/dune b/src/ocaml-index/tests/dune
similarity index 86%
rename from tests/test-dirs/ocaml-index/dune
rename to src/ocaml-index/tests/dune
index 6e136ff7f..e304a31f6 100644
--- a/tests/test-dirs/ocaml-index/dune
+++ b/src/ocaml-index/tests/dune
@@ -4,6 +4,7 @@
   (package ocaml-index)))
 
 (cram
+ (package ocaml-index)
  (applies_to :whole_subtree)
  (deps
   (alias ocaml-index-test-deps)))
diff --git a/tests/test-dirs/ocaml-index/cmd.t b/src/ocaml-index/tests/tests-dirs/cmd.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/cmd.t
rename to src/ocaml-index/tests/tests-dirs/cmd.t
diff --git a/tests/test-dirs/ocaml-index/flags.t b/src/ocaml-index/tests/tests-dirs/flags.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/flags.t
rename to src/ocaml-index/tests/tests-dirs/flags.t
diff --git a/tests/test-dirs/ocaml-index/index-project.t b/src/ocaml-index/tests/tests-dirs/index-project.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/index-project.t
rename to src/ocaml-index/tests/tests-dirs/index-project.t
diff --git a/tests/test-dirs/ocaml-index/interfaces.t b/src/ocaml-index/tests/tests-dirs/interfaces.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/interfaces.t
rename to src/ocaml-index/tests/tests-dirs/interfaces.t
diff --git a/tests/test-dirs/ocaml-index/local-shape-and-include.t b/src/ocaml-index/tests/tests-dirs/local-shape-and-include.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/local-shape-and-include.t
rename to src/ocaml-index/tests/tests-dirs/local-shape-and-include.t
diff --git a/tests/test-dirs/ocaml-index/transitive-deps.t b/src/ocaml-index/tests/tests-dirs/transitive-deps.t
similarity index 100%
rename from tests/test-dirs/ocaml-index/transitive-deps.t
rename to src/ocaml-index/tests/tests-dirs/transitive-deps.t
diff --git a/tests/test-dirs/occurrences/project-wide/dune b/tests/test-dirs/occurrences/project-wide/dune
index f0d4d3232..9b429078a 100644
--- a/tests/test-dirs/occurrences/project-wide/dune
+++ b/tests/test-dirs/occurrences/project-wide/dune
@@ -1,12 +1,11 @@
 (cram
- (package ocaml-index)
  (applies_to :whole_subtree)
  (deps
   %{bin:ocaml-index}))
 
 (cram
  (applies_to pwo-ml-gen)
- (enabled_if (and %{bin-available:ocaml-index} (>= %{read:version/dune.txt} "3.16"))))
+ (enabled_if (>= %{read:version/dune.txt} "3.16")))
 
 (subdir
  version