diff --git a/Cargo.toml b/Cargo.toml
index 96a4d1b..fe080c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,5 +81,65 @@ path = "src/lib.rs"
 name = "ngit-grasp"
 path = "src/main.rs"
 
+[[test]]
+name = "nip09_announcement_cascade"
+path = "tests/lifecycle/nip09_announcement_cascade.rs"
+
+[[test]]
+name = "nip09_blacklist_ops"
+path = "tests/lifecycle/nip09_blacklist_ops.rs"
+
+[[test]]
+name = "nip09_cascade_event_types"
+path = "tests/lifecycle/nip09_cascade_event_types.rs"
+
+[[test]]
+name = "nip09_disrespector"
+path = "tests/lifecycle/nip09_disrespector.rs"
+
+[[test]]
+name = "nip09_git_archive_cleanup"
+path = "tests/lifecycle/nip09_git_archive_cleanup.rs"
+
+[[test]]
+name = "nip09_holding_cleanup"
+path = "tests/lifecycle/nip09_holding_cleanup.rs"
+
+[[test]]
+name = "nip09_holding_db"
+path = "tests/lifecycle/nip09_holding_db.rs"
+
+[[test]]
+name = "nip09_multi_maintainer"
+path = "tests/lifecycle/nip09_multi_maintainer.rs"
+
+[[test]]
+name = "nip09_recovery"
+path = "tests/lifecycle/nip09_recovery.rs"
+
+[[test]]
+name = "nip09_state_cascade"
+path = "tests/lifecycle/nip09_state_cascade.rs"
+
+[[test]]
+name = "nip09_state_multi_maintainer"
+path = "tests/lifecycle/nip09_state_multi_maintainer.rs"
+
+[[test]]
+name = "nip09_validation"
+path = "tests/lifecycle/nip09_validation.rs"
+
+[[test]]
+name = "nip62_lifecycle"
+path = "tests/lifecycle/nip62_lifecycle.rs"
+
+[[test]]
+name = "nip62_validation"
+path = "tests/lifecycle/nip62_validation.rs"
+
+[[test]]
+name = "replaceable_history"
+path = "tests/lifecycle/replaceable_history.rs"
+
 [workspace]
 members = [".", "grasp-audit"]
diff --git a/tests/nip09_announcement_cascade.rs b/tests/lifecycle/nip09_announcement_cascade.rs
similarity index 99%
rename from tests/nip09_announcement_cascade.rs
rename to tests/lifecycle/nip09_announcement_cascade.rs
index 7da6648..9da3484 100644
--- a/tests/nip09_announcement_cascade.rs
+++ b/tests/lifecycle/nip09_announcement_cascade.rs
@@ -24,6 +24,7 @@
 //! cargo test --test nip09_announcement_cascade -- --nocapture
 //! ```
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{announcement_coordinate, build_deletion, publish_served_repo, TestRelay};
diff --git a/tests/nip09_blacklist_ops.rs b/tests/lifecycle/nip09_blacklist_ops.rs
similarity index 100%
rename from tests/nip09_blacklist_ops.rs
rename to tests/lifecycle/nip09_blacklist_ops.rs
diff --git a/tests/nip09_cascade_event_types.rs b/tests/lifecycle/nip09_cascade_event_types.rs
similarity index 99%
rename from tests/nip09_cascade_event_types.rs
rename to tests/lifecycle/nip09_cascade_event_types.rs
index 0dda667..cc0567c 100644
--- a/tests/nip09_cascade_event_types.rs
+++ b/tests/lifecycle/nip09_cascade_event_types.rs
@@ -4,6 +4,7 @@
 //! (1630), comment (1111), repo-status (1633), PR chain
 //! (1618/1619/1631/1632).
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_disrespector.rs b/tests/lifecycle/nip09_disrespector.rs
similarity index 99%
rename from tests/nip09_disrespector.rs
rename to tests/lifecycle/nip09_disrespector.rs
index 4e0f220..a64a47e 100644
--- a/tests/nip09_disrespector.rs
+++ b/tests/lifecycle/nip09_disrespector.rs
@@ -28,6 +28,7 @@
 //! cargo test --test nip09_disrespector -- --nocapture
 //! ```
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_git_archive_cleanup.rs b/tests/lifecycle/nip09_git_archive_cleanup.rs
similarity index 99%
rename from tests/nip09_git_archive_cleanup.rs
rename to tests/lifecycle/nip09_git_archive_cleanup.rs
index c3cf269..766f2f0 100644
--- a/tests/nip09_git_archive_cleanup.rs
+++ b/tests/lifecycle/nip09_git_archive_cleanup.rs
@@ -1,5 +1,6 @@
 //! Integration tests for Phase 4 git archive lifecycle.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{announcement_coordinate, build_deletion, publish_served_repo, TestRelay};
diff --git a/tests/nip09_holding_cleanup.rs b/tests/lifecycle/nip09_holding_cleanup.rs
similarity index 100%
rename from tests/nip09_holding_cleanup.rs
rename to tests/lifecycle/nip09_holding_cleanup.rs
diff --git a/tests/nip09_holding_db.rs b/tests/lifecycle/nip09_holding_db.rs
similarity index 99%
rename from tests/nip09_holding_db.rs
rename to tests/lifecycle/nip09_holding_db.rs
index ad2e489..4830782 100644
--- a/tests/nip09_holding_db.rs
+++ b/tests/lifecycle/nip09_holding_db.rs
@@ -1,5 +1,6 @@
 //! Focused integration tests for Phase 2 holding-DB semantics.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_multi_maintainer.rs b/tests/lifecycle/nip09_multi_maintainer.rs
similarity index 99%
rename from tests/nip09_multi_maintainer.rs
rename to tests/lifecycle/nip09_multi_maintainer.rs
index f0451be..70d7b86 100644
--- a/tests/nip09_multi_maintainer.rs
+++ b/tests/lifecycle/nip09_multi_maintainer.rs
@@ -14,6 +14,7 @@
 //! independent second-announcement git promotion is not currently reliable in
 //! this fixture setup.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_recovery.rs b/tests/lifecycle/nip09_recovery.rs
similarity index 99%
rename from tests/nip09_recovery.rs
rename to tests/lifecycle/nip09_recovery.rs
index a50cf4b..474033d 100644
--- a/tests/nip09_recovery.rs
+++ b/tests/lifecycle/nip09_recovery.rs
@@ -1,5 +1,6 @@
 //! Integration tests for Phase 5 NIP-09 recovery workflow.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_state_cascade.rs b/tests/lifecycle/nip09_state_cascade.rs
similarity index 99%
rename from tests/nip09_state_cascade.rs
rename to tests/lifecycle/nip09_state_cascade.rs
index 64107db..de84e10 100644
--- a/tests/nip09_state_cascade.rs
+++ b/tests/lifecycle/nip09_state_cascade.rs
@@ -3,6 +3,7 @@
 //! These tests extend the announcement-cascade coverage to kind-30618
 //! repository state events in the **single-maintainer** case.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_state_multi_maintainer.rs b/tests/lifecycle/nip09_state_multi_maintainer.rs
similarity index 99%
rename from tests/nip09_state_multi_maintainer.rs
rename to tests/lifecycle/nip09_state_multi_maintainer.rs
index c46ad17..8ef28f4 100644
--- a/tests/nip09_state_multi_maintainer.rs
+++ b/tests/lifecycle/nip09_state_multi_maintainer.rs
@@ -10,6 +10,7 @@
 //! Serving note: second-maintainer announcements are served via the maintainer
 //! exception path in this suite (`maintainers` tag + non-local `relays` tag).
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip09_validation.rs b/tests/lifecycle/nip09_validation.rs
similarity index 99%
rename from tests/nip09_validation.rs
rename to tests/lifecycle/nip09_validation.rs
index ab40bc3..840a2e9 100644
--- a/tests/nip09_validation.rs
+++ b/tests/lifecycle/nip09_validation.rs
@@ -49,6 +49,7 @@
 //! cargo test --test nip09_validation -- --nocapture
 //! ```
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{
diff --git a/tests/nip62_lifecycle.rs b/tests/lifecycle/nip62_lifecycle.rs
similarity index 99%
rename from tests/nip62_lifecycle.rs
rename to tests/lifecycle/nip62_lifecycle.rs
index b36f544..6766e37 100644
--- a/tests/nip62_lifecycle.rs
+++ b/tests/lifecycle/nip62_lifecycle.rs
@@ -5,6 +5,7 @@
 //! lifecycle: targeted vanish requests must move served data through holding and
 //! repository archival instead of hard-deleting directly from the main DB.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{build_vanish, publish_served_repo, TestRelay};
diff --git a/tests/nip62_validation.rs b/tests/lifecycle/nip62_validation.rs
similarity index 99%
rename from tests/nip62_validation.rs
rename to tests/lifecycle/nip62_validation.rs
index 0762c9e..8013898 100644
--- a/tests/nip62_validation.rs
+++ b/tests/lifecycle/nip62_validation.rs
@@ -48,6 +48,7 @@
 //! cargo test --test nip62_validation -- --nocapture
 //! ```
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use common::{announcement_served_by_coordinate, build_vanish, publish_served_repo, TestRelay};
diff --git a/tests/replaceable_history.rs b/tests/lifecycle/replaceable_history.rs
similarity index 99%
rename from tests/replaceable_history.rs
rename to tests/lifecycle/replaceable_history.rs
index 2335641..5c0a879 100644
--- a/tests/replaceable_history.rs
+++ b/tests/lifecycle/replaceable_history.rs
@@ -1,5 +1,6 @@
 //! Integration tests for durable replaceable/addressable history capture.
 
+#[path = "../common/mod.rs"]
 mod common;
 
 use clap::Parser;