diff --git a/odoc-parser.opam b/odoc-parser.opam
index e2a97d4a7c..e4fd20d853 100644
--- a/odoc-parser.opam
+++ b/odoc-parser.opam
@@ -31,7 +31,8 @@ build: [
"-j"
jobs
"@install"
- "@runtest" {with-test}
+ # Tests are not all associated with a package and would be run if using the
+ # default '@runtest'.
+ "@src/parser/runtest" {with-test}
]
]
-
diff --git a/odoc.opam b/odoc.opam
index 787861e5b0..82575753f3 100644
--- a/odoc.opam
+++ b/odoc.opam
@@ -57,7 +57,7 @@ depends: [
"ppx_expect" {with-test}
"bos" {with-test}
- "crunch"
+ "crunch" {> "1.1.0"}
("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
]
diff --git a/src/parser/test/dune b/src/parser/test/dune
index c6769550dd..28c4d82f74 100644
--- a/src/parser/test/dune
+++ b/src/parser/test/dune
@@ -1,5 +1,6 @@
(library
(name odoc_parser_test)
+ (package odoc-parser)
(inline_tests)
(enabled_if
(>= %{ocaml_version} 4.04.1))
diff --git a/test/generators/html/Bugs_pre_410.html b/test/generators/html/Bugs_pre_410.html
index f19d16f3cf..e0fb955358 100644
--- a/test/generators/html/Bugs_pre_410.html
+++ b/test/generators/html/Bugs_pre_410.html
@@ -1,7 +1,7 @@
-
Bugs_pre_410 (Bugs_pre_410)
-
+ Bugs_pre_410 (Bugs_pre_410)
+
diff --git a/test/integration/simple_dune_project.t/bar.ml b/test/integration/simple_dune_project.t/bar.ml
deleted file mode 100644
index 1807dba1d4..0000000000
--- a/test/integration/simple_dune_project.t/bar.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t = Foo.t
diff --git a/test/integration/simple_dune_project.t/dune b/test/integration/simple_dune_project.t/dune
deleted file mode 100644
index 17f31b13ee..0000000000
--- a/test/integration/simple_dune_project.t/dune
+++ /dev/null
@@ -1,3 +0,0 @@
-(library
- (name dune_odoc_test)
- (public_name dune_odoc_test))
diff --git a/test/integration/simple_dune_project.t/dune-project b/test/integration/simple_dune_project.t/dune-project
deleted file mode 100644
index de4fc20920..0000000000
--- a/test/integration/simple_dune_project.t/dune-project
+++ /dev/null
@@ -1 +0,0 @@
-(lang dune 1.0)
diff --git a/test/integration/simple_dune_project.t/dune_odoc_test.opam b/test/integration/simple_dune_project.t/dune_odoc_test.opam
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/integration/simple_dune_project.t/foo.ml b/test/integration/simple_dune_project.t/foo.ml
deleted file mode 100644
index 63c57c4e0c..0000000000
--- a/test/integration/simple_dune_project.t/foo.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t
diff --git a/test/integration/simple_dune_project.t/run.t b/test/integration/simple_dune_project.t/run.t
deleted file mode 100644
index 340d525566..0000000000
--- a/test/integration/simple_dune_project.t/run.t
+++ /dev/null
@@ -1,10 +0,0 @@
-Build the documentation of a simple Dune library.
-
- $ dune build @install @doc
-
- $ find _build/default/_doc/_html -name '*.html' | sort
- _build/default/_doc/_html/dune_odoc_test/Dune_odoc_test/Bar/index.html
- _build/default/_doc/_html/dune_odoc_test/Dune_odoc_test/Foo/index.html
- _build/default/_doc/_html/dune_odoc_test/Dune_odoc_test/index.html
- _build/default/_doc/_html/dune_odoc_test/index.html
- _build/default/_doc/_html/index.html