diff --git a/apps/coercion/tests/coercion.t/run.t b/apps/coercion/tests/coercion.t/run.t
deleted file mode 100644
index cdfb3b585..000000000
--- a/apps/coercion/tests/coercion.t/run.t
+++ /dev/null
@@ -1,12 +0,0 @@
-  $ . ../setup-project.sh
-  $ dune build test.vo
-  true && false
-       : bool
-  natmul R n : ringType_sort R
-       : ringType_sort R
-  natmul R n : ringType_sort R
-       : ringType_sort R
-  $ dune build test2.vo
-  true : bool
-       : bool
-
diff --git a/apps/coercion/tests/coercion_open.t/run.t b/apps/coercion/tests/coercion_open.t/run.t
deleted file mode 100644
index 333c9552c..000000000
--- a/apps/coercion/tests/coercion_open.t/run.t
+++ /dev/null
@@ -1,4 +0,0 @@
-  $ . ../setup-project.sh
-  $ dune build test.vo
-  1
-       : nat
diff --git a/apps/coercion/tests/dune b/apps/coercion/tests/dune
index c49811c04..5d0075e46 100644
--- a/apps/coercion/tests/dune
+++ b/apps/coercion/tests/dune
@@ -1,7 +1,6 @@
-(cram
- (applies_to :whole_subtree)
- (deps
-  %{bin:coqc}
-  %{bin:coqdep}
-  (package coq-elpi)
-  setup-project.sh))
+(coq.theory
+ (name elpi.apps.coercion.tests)
+ (package coq-elpi-tests)
+ (theories elpi elpi.apps.coercion))
+
+(include_subdirs qualified)
diff --git a/apps/coercion/tests/setup-project.sh b/apps/coercion/tests/setup-project.sh
deleted file mode 120000
index c0d2a8f89..000000000
--- a/apps/coercion/tests/setup-project.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../etc/setup-project.sh
\ No newline at end of file
diff --git a/apps/coercion/tests/coercion.t/test.v b/apps/coercion/tests/test.v
similarity index 100%
rename from apps/coercion/tests/coercion.t/test.v
rename to apps/coercion/tests/test.v
diff --git a/apps/coercion/tests/coercion.t/test2.v b/apps/coercion/tests/test2.v
similarity index 100%
rename from apps/coercion/tests/coercion.t/test2.v
rename to apps/coercion/tests/test2.v
diff --git a/apps/coercion/tests/coercion_open.t/test.v b/apps/coercion/tests/test_open.v
similarity index 100%
rename from apps/coercion/tests/coercion_open.t/test.v
rename to apps/coercion/tests/test_open.v
diff --git a/etc/run.t b/etc/run.t
deleted file mode 100644
index 932b53176..000000000
--- a/etc/run.t
+++ /dev/null
@@ -1,4 +0,0 @@
-  $ . ../setup-project.sh
-  ***** UNREACHABLE *****
-  $ dune build test.vo
-  ***** UNREACHABLE *****
diff --git a/etc/setup-project.sh b/etc/setup-project.sh
deleted file mode 100755
index d05e25aa8..000000000
--- a/etc/setup-project.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-if coqc --print-version | cut -d ' ' -f 1 | grep -q "^9" ; then STDLIB="Stdlib"; else STDLIB=""; fi
-
-if [ -z "$DEPS" ]; then DEPS="elpi_elpi elpi $STDLIB"; else DEPS="elpi_elpi elpi $STDLIB $DEPS"; fi
-
-cat > dune <<EOF
-(env
- (dev
-  (env-vars
-   (COQ_ELPI_ATTRIBUTES "test=yes,str=\"some-string\""))))
-
-(coq.theory
- (name test)
- (theories ${DEPS}))
-EOF
-
-cat > dune-project <<EOF
-(lang dune 3.13)
-(using coq 0.8)
-EOF
-
-export COQPATH="$DUNE_SOURCEROOT/_build/install/default/lib/coq/user-contrib"
-export DUNE_CACHE=disabled