diff --git a/atdgen-codec-runtime.opam b/atdgen-codec-runtime.opam
index 2d067a82..3d328186 100644
--- a/atdgen-codec-runtime.opam
+++ b/atdgen-codec-runtime.opam
@@ -28,6 +28,7 @@ depends: [
   "dune" {>= "1.11"}
   "ocaml" {>= "4.02"}
 ]
+dev-repo: "git+https://github.com/ahrefs/atd.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -38,8 +39,6 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ahrefs/atd.git"
diff --git a/atdgen-runtime.opam b/atdgen-runtime.opam
index fa47ae6c..9c7ddafb 100644
--- a/atdgen-runtime.opam
+++ b/atdgen-runtime.opam
@@ -31,6 +31,7 @@ depends: [
   "biniou" {>= "1.0.6"}
   "re"
 ]
+dev-repo: "git+https://github.com/ahrefs/atd.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -41,8 +42,6 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ahrefs/atd.git"
diff --git a/atdgen.opam b/atdgen.opam
index 293ed154..39b64c3d 100644
--- a/atdgen.opam
+++ b/atdgen.opam
@@ -41,6 +41,7 @@ depends: [
   "biniou" {>= "1.0.6"}
   "yojson" {>= "1.7.0"}
 ]
+dev-repo: "git+https://github.com/ahrefs/atd.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -51,8 +52,6 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ahrefs/atd.git"
diff --git a/atdgen/test/dune b/atdgen/test/dune
index f55e22e9..97d1c53b 100644
--- a/atdgen/test/dune
+++ b/atdgen/test/dune
@@ -196,11 +196,11 @@
 
 (rule
  (targets test_annot_error.stderr)
- (deps    test_annot_error.atd)
+ (deps    (:atd test_annot_error.atd) %{bin:atdgen})
  (action
    (with-stderr-to test_annot_error.stderr
    (with-stdout-to test_annot_error.stdout
-     (bash "%{bin:atdgen} -t %{deps} || echo 'Failed succesfully!'")))))
+     (bash "%{bin:atdgen} -t %{atd} || echo 'Failed succesfully!'")))))
 
 (alias
  (name runtest)
@@ -229,7 +229,6 @@
   testj
   testv
   test_atdgen_main
-  test_atdgen_type_conv
   test_lib))
 
 (alias
diff --git a/atdgen/test/test_atdgen_type_conv.ml b/atdgen/test/test_atdgen_type_conv.ml
deleted file mode 100644
index 6b5b2fd6..00000000
--- a/atdgen/test/test_atdgen_type_conv.ml
+++ /dev/null
@@ -1,19 +0,0 @@
-open Sexplib.Std
-
-let my_record = Test_type_conv_t.({ fst=123; snd="testing" })
-
-let cmrs : (float Test_type_conv_t.contains_my_record) list =
-  let open Test_type_conv_t in
-  [ `C1 123
-  ; `C2 123.0
-  ; `C3 my_record ]
-
-let sexps =
-  [my_record |> Test_type_conv_t.sexp_of_my_record] @
-  (List.map (Test_type_conv_t.sexp_of_contains_my_record sexp_of_float) cmrs)
-
-let () =
-  sexps
-  |> sexp_of_list (fun x -> x)
-  |> Sexplib.Sexp.to_string
-  |> print_endline
diff --git a/atdgen/test/test_type_conv.atd b/atdgen/test/test_type_conv.atd
deleted file mode 100644
index bde8b49a..00000000
--- a/atdgen/test/test_type_conv.atd
+++ /dev/null
@@ -1,13 +0,0 @@
-<doc text="testing -type-conv.">
-
-type my_record = {
-  fst: int;
-  snd: string;
-}
-
-
-type 'a contains_my_record = [
-  | C1 of int
-  | C2 of 'a
-  | C3 of my_record
-]
diff --git a/atdj.opam.template b/atdj.opam.template
deleted file mode 100644
index b25400da..00000000
--- a/atdj.opam.template
+++ /dev/null
@@ -1,13 +0,0 @@
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@doc" {with-doc}
-  ]
-]
diff --git a/atds.opam b/atds.opam
index 982eb168..5f7413ef 100644
--- a/atds.opam
+++ b/atds.opam
@@ -28,6 +28,7 @@ depends: [
   "atd" {>= "2.0.0"}
   "re"
 ]
+dev-repo: "git+https://github.com/ahrefs/atd.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -38,8 +39,6 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ahrefs/atd.git"
diff --git a/dune b/dune
index 613cf7ea..cf4e6a69 100644
--- a/dune
+++ b/dune
@@ -2,4 +2,10 @@
  ;; disable warnings against "Innocuous unused variables"
  ;; enforce the separation between types `string` and `bytes`
  (dev (flags :standard -w -27 -safe-string))
- (release (flags :standard -w -27 -safe-string)))
\ No newline at end of file
+ (release (flags :standard -w -27 -safe-string)))
+
+(rule (copy atd.opam.template atdgen-codec-runtime.opam.template))
+(rule (copy atd.opam.template atdgen-runtime.opam.template))
+(rule (copy atd.opam.template atdgen.opam.template))
+(rule (copy atd.opam.template atdj.opam.template))
+(rule (copy atd.opam.template atds.opam.template))