diff --git a/Cargo.toml b/Cargo.toml
index e5fa1d0e9..818452467 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ members = [
   "src/ariel-os-storage",
   "tests/benchmarks/bench_sched_flags",
   "tests/benchmarks/bench_sched_yield",
+  "tests/coap",
   "tests/gpio",
   "tests/gpio-interrupt-nrf",
   "tests/gpio-interrupt-stm32",
diff --git a/examples/laze.yml b/examples/laze.yml
index fca0bb9b6..148a904ab 100644
--- a/examples/laze.yml
+++ b/examples/laze.yml
@@ -7,7 +7,6 @@ subdirs:
   - benchmark
   - blinky
   - core-sizes
-  - coap
   - coap-server
   - device-metadata
   - embassy-http-server
diff --git a/examples/coap/Cargo.toml b/tests/coap/Cargo.toml
similarity index 100%
rename from examples/coap/Cargo.toml
rename to tests/coap/Cargo.toml
diff --git a/examples/coap/README.md b/tests/coap/README.md
similarity index 94%
rename from examples/coap/README.md
rename to tests/coap/README.md
index 72219f603..7769a0327 100644
--- a/examples/coap/README.md
+++ b/tests/coap/README.md
@@ -1,4 +1,4 @@
-# coap demo
+# coap tests
 
 ## About
 
@@ -21,7 +21,7 @@ This application is a work in progress demo of running CoAP with OSCORE/EDHOC se
 
 ## Roadmap
 
-Eventually, this should be a 20 line demo.
+Eventually, all of this should be covered by 20 line examples.
 
 Until the CoAP roadmap is complete,
 this serves as a work bench, test bed, demo zone and playground at the same time.
diff --git a/examples/coap/client.cosekey b/tests/coap/client.cosekey
similarity index 100%
rename from examples/coap/client.cosekey
rename to tests/coap/client.cosekey
diff --git a/examples/coap/client.diag b/tests/coap/client.diag
similarity index 100%
rename from examples/coap/client.diag
rename to tests/coap/client.diag
diff --git a/examples/coap/fauxhoc.py b/tests/coap/fauxhoc.py
similarity index 100%
rename from examples/coap/fauxhoc.py
rename to tests/coap/fauxhoc.py
diff --git a/examples/coap/laze.yml b/tests/coap/laze.yml
similarity index 100%
rename from examples/coap/laze.yml
rename to tests/coap/laze.yml
diff --git a/examples/coap/src/main.rs b/tests/coap/src/main.rs
similarity index 100%
rename from examples/coap/src/main.rs
rename to tests/coap/src/main.rs
diff --git a/tests/laze.yml b/tests/laze.yml
index d7491046a..332863200 100644
--- a/tests/laze.yml
+++ b/tests/laze.yml
@@ -1,5 +1,6 @@
 subdirs:
   - benchmarks
+  - coap
   - gpio
   - gpio-interrupt-nrf
   - gpio-interrupt-stm32