diff --git a/nix/internal-tests.nix b/nix/internal-tests.nix
index a2454edc35bb1ad1474dcb16bcfe7b514d9a6fc2..5512f6013d84ee6b63e7b0e1da30a7df68883e1b 100644
--- a/nix/internal-tests.nix
+++ b/nix/internal-tests.nix
@@ -26,6 +26,7 @@
 , mlmpfr
 , ocaml
 , ocamlgraph
+, ocp-indent
 , ppx_deriving
 , ppx_deriving_yojson
 , ppx_import
@@ -79,6 +80,7 @@ stdenvNoCC.mkDerivation rec {
     mlmpfr
     ocaml
     ocamlgraph
+    ocp-indent
     ppx_deriving
     ppx_deriving_yojson
     ppx_import
diff --git a/opam b/opam
index 2ddbf01f257a0a1c788d2f51d957e8ccefac561c..a42fd9599d6121431d0da2ae7f5a2d636b300133 100644
--- a/opam
+++ b/opam
@@ -124,6 +124,10 @@ depends: [
   "yojson" { >= "1.6.0" & < "2.0.0" }
   "zarith" { >= "1.5" }
 
+  # To be removed when frama-c-lint/hdrck are in separate opam packages
+  "camomile"
+  "ocp-indent"
+
   # PPXs
   "ppx_deriving"
   "ppx_deriving_yojson"