diff --git a/AGENTS.md b/AGENTS.md
index 63b0a1b..41f9975 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -311,6 +311,3 @@ For automated contributors specifically:
 - Integration tests stay in the crate's `tests/` directory.
 - OpenHuman's `scripts/externalize-inline-tests.mjs <repo-root> --write` moves
   inline test modules out mechanically; without `--write` it only reports.
-- Existing `test.rs` and `<module>_test.rs` files predate this rule. Rename each
-  to `<module>_tests.rs` (keep its `mod` name, add the `#[path]` attribute) the
-  next time you touch it.
diff --git a/crates/tinytools-agent/src/codecall/mod.rs b/crates/tinytools-agent/src/codecall/mod.rs
index 6c923ad..e9f09af 100644
--- a/crates/tinytools-agent/src/codecall/mod.rs
+++ b/crates/tinytools-agent/src/codecall/mod.rs
@@ -53,6 +53,7 @@ mod signature;
 mod types;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 use serde_json::{Map, Value};
diff --git a/crates/tinytools-agent/src/codecall/test.rs b/crates/tinytools-agent/src/codecall/mod_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/codecall/test.rs
rename to crates/tinytools-agent/src/codecall/mod_tests.rs
diff --git a/crates/tinytools-agent/src/dialect/mod.rs b/crates/tinytools-agent/src/dialect/mod.rs
index d7e4046..0568f11 100644
--- a/crates/tinytools-agent/src/dialect/mod.rs
+++ b/crates/tinytools-agent/src/dialect/mod.rs
@@ -123,5 +123,5 @@ pub trait ToolDialect: Send + Sync {
 }
 
 #[cfg(test)]
-#[path = "test.rs"]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-agent/src/dialect/test.rs b/crates/tinytools-agent/src/dialect/mod_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/dialect/test.rs
rename to crates/tinytools-agent/src/dialect/mod_tests.rs
diff --git a/crates/tinytools-agent/src/parse/protected.rs b/crates/tinytools-agent/src/parse/protected.rs
index 2189fdd..7117e7f 100644
--- a/crates/tinytools-agent/src/parse/protected.rs
+++ b/crates/tinytools-agent/src/parse/protected.rs
@@ -20,6 +20,7 @@
 use std::ops::Range;
 
 #[cfg(test)]
+#[path = "protected/protected_tests.rs"]
 mod test;
 
 /// Info-string languages that mark a fence as a tool call rather than a code
diff --git a/crates/tinytools-agent/src/parse/protected/test.rs b/crates/tinytools-agent/src/parse/protected/protected_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/parse/protected/test.rs
rename to crates/tinytools-agent/src/parse/protected/protected_tests.rs
diff --git a/crates/tinytools-agent/src/pformat.rs b/crates/tinytools-agent/src/pformat.rs
index 62c2b21..96010d1 100644
--- a/crates/tinytools-agent/src/pformat.rs
+++ b/crates/tinytools-agent/src/pformat.rs
@@ -441,5 +441,5 @@ pub(crate) fn coerce_value(raw: &str, ty: PFormatParamType) -> Value {
 // ──────────────────────────────────────────────────────────────────────
 
 #[cfg(test)]
-#[path = "pformat_test.rs"]
+#[path = "pformat_tests.rs"]
 mod tests;
diff --git a/crates/tinytools-agent/src/pformat_test.rs b/crates/tinytools-agent/src/pformat_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/pformat_test.rs
rename to crates/tinytools-agent/src/pformat_tests.rs
diff --git a/crates/tinytools-agent/src/render/results.rs b/crates/tinytools-agent/src/render/results.rs
index 00302f8..dfc04bc 100644
--- a/crates/tinytools-agent/src/render/results.rs
+++ b/crates/tinytools-agent/src/render/results.rs
@@ -364,5 +364,5 @@ fn unescape_attribute(value: &str) -> String {
 }
 
 #[cfg(test)]
-#[path = "results_test.rs"]
+#[path = "results_tests.rs"]
 mod test;
diff --git a/crates/tinytools-agent/src/render/results_test.rs b/crates/tinytools-agent/src/render/results_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/render/results_test.rs
rename to crates/tinytools-agent/src/render/results_tests.rs
diff --git a/crates/tinytools-agent/src/stream/mod.rs b/crates/tinytools-agent/src/stream/mod.rs
index d5a86e9..242733b 100644
--- a/crates/tinytools-agent/src/stream/mod.rs
+++ b/crates/tinytools-agent/src/stream/mod.rs
@@ -177,4 +177,5 @@ fn trailing_bare_angle_bracket(tail: &str) -> Option<usize> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-agent/src/stream/test.rs b/crates/tinytools-agent/src/stream/mod_tests.rs
similarity index 100%
rename from crates/tinytools-agent/src/stream/test.rs
rename to crates/tinytools-agent/src/stream/mod_tests.rs
diff --git a/crates/tinytools-jev/src/lib.rs b/crates/tinytools-jev/src/lib.rs
index 8e06229..77176dc 100644
--- a/crates/tinytools-jev/src/lib.rs
+++ b/crates/tinytools-jev/src/lib.rs
@@ -5,6 +5,7 @@
 
 mod family;
 #[cfg(test)]
+#[path = "lib_tests.rs"]
 mod test;
 mod types;
 pub use types::{
diff --git a/crates/tinytools-jev/src/test.rs b/crates/tinytools-jev/src/lib_tests.rs
similarity index 100%
rename from crates/tinytools-jev/src/test.rs
rename to crates/tinytools-jev/src/lib_tests.rs
diff --git a/crates/tinytools-std/src/detect_tools/mod.rs b/crates/tinytools-std/src/detect_tools/mod.rs
index aa040b0..d05ff6f 100644
--- a/crates/tinytools-std/src/detect_tools/mod.rs
+++ b/crates/tinytools-std/src/detect_tools/mod.rs
@@ -180,4 +180,5 @@ impl Tool for DetectToolsTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/detect_tools/test.rs b/crates/tinytools-std/src/detect_tools/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/detect_tools/test.rs
rename to crates/tinytools-std/src/detect_tools/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/apply_patch/mod.rs b/crates/tinytools-std/src/filesystem/apply_patch/mod.rs
index 1b81e56..2e2f0fb 100644
--- a/crates/tinytools-std/src/filesystem/apply_patch/mod.rs
+++ b/crates/tinytools-std/src/filesystem/apply_patch/mod.rs
@@ -442,4 +442,5 @@ struct FileBuffer {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/apply_patch/test.rs b/crates/tinytools-std/src/filesystem/apply_patch/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/apply_patch/test.rs
rename to crates/tinytools-std/src/filesystem/apply_patch/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/contract_test.rs b/crates/tinytools-std/src/filesystem/contract_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/contract_test.rs
rename to crates/tinytools-std/src/filesystem/contract_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/csv_export/extra_test.rs b/crates/tinytools-std/src/filesystem/csv_export/extra_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/csv_export/extra_test.rs
rename to crates/tinytools-std/src/filesystem/csv_export/extra_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/csv_export/mod.rs b/crates/tinytools-std/src/filesystem/csv_export/mod.rs
index c256863..354c6ce 100644
--- a/crates/tinytools-std/src/filesystem/csv_export/mod.rs
+++ b/crates/tinytools-std/src/filesystem/csv_export/mod.rs
@@ -262,7 +262,9 @@ impl CsvExportTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "extra_tests.rs"]
 mod extra_test;
diff --git a/crates/tinytools-std/src/filesystem/csv_export/test.rs b/crates/tinytools-std/src/filesystem/csv_export/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/csv_export/test.rs
rename to crates/tinytools-std/src/filesystem/csv_export/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/edit_file/mod.rs b/crates/tinytools-std/src/filesystem/edit_file/mod.rs
index c86a6f4..95fa5e9 100644
--- a/crates/tinytools-std/src/filesystem/edit_file/mod.rs
+++ b/crates/tinytools-std/src/filesystem/edit_file/mod.rs
@@ -238,4 +238,5 @@ impl EditFileTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/edit_file/test.rs b/crates/tinytools-std/src/filesystem/edit_file/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/edit_file/test.rs
rename to crates/tinytools-std/src/filesystem/edit_file/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/file_read/extra_test.rs b/crates/tinytools-std/src/filesystem/file_read/extra_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/file_read/extra_test.rs
rename to crates/tinytools-std/src/filesystem/file_read/extra_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/file_read/mod.rs b/crates/tinytools-std/src/filesystem/file_read/mod.rs
index dbb7343..0dd1a14 100644
--- a/crates/tinytools-std/src/filesystem/file_read/mod.rs
+++ b/crates/tinytools-std/src/filesystem/file_read/mod.rs
@@ -232,7 +232,9 @@ fn page_contents(contents: &str, path: &str, offset: usize) -> String {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "extra_tests.rs"]
 mod extra_test;
diff --git a/crates/tinytools-std/src/filesystem/file_read/test.rs b/crates/tinytools-std/src/filesystem/file_read/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/file_read/test.rs
rename to crates/tinytools-std/src/filesystem/file_read/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/file_write/mod.rs b/crates/tinytools-std/src/filesystem/file_write/mod.rs
index 24459bb5f..0efcd66 100644
--- a/crates/tinytools-std/src/filesystem/file_write/mod.rs
+++ b/crates/tinytools-std/src/filesystem/file_write/mod.rs
@@ -230,4 +230,5 @@ impl FileWriteTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/file_write/test.rs b/crates/tinytools-std/src/filesystem/file_write/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/file_write/test.rs
rename to crates/tinytools-std/src/filesystem/file_write/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/gate_test.rs b/crates/tinytools-std/src/filesystem/gate_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/gate_test.rs
rename to crates/tinytools-std/src/filesystem/gate_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/git_operations/config_test.rs b/crates/tinytools-std/src/filesystem/git_operations/config_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/git_operations/config_test.rs
rename to crates/tinytools-std/src/filesystem/git_operations/config_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/git_operations/mod.rs b/crates/tinytools-std/src/filesystem/git_operations/mod.rs
index b07c1e2..fadcbb0 100644
--- a/crates/tinytools-std/src/filesystem/git_operations/mod.rs
+++ b/crates/tinytools-std/src/filesystem/git_operations/mod.rs
@@ -643,10 +643,14 @@ impl GitOperationsTool {
 }
 
 #[cfg(test)]
+#[path = "config_tests.rs"]
 mod config_test;
 #[cfg(test)]
+#[path = "ops_tests.rs"]
 mod ops_test;
 #[cfg(test)]
+#[path = "render_tests.rs"]
 mod render_test;
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/git_operations/test.rs b/crates/tinytools-std/src/filesystem/git_operations/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/git_operations/test.rs
rename to crates/tinytools-std/src/filesystem/git_operations/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/git_operations/ops_test.rs b/crates/tinytools-std/src/filesystem/git_operations/ops_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/git_operations/ops_test.rs
rename to crates/tinytools-std/src/filesystem/git_operations/ops_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/git_operations/render_test.rs b/crates/tinytools-std/src/filesystem/git_operations/render_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/git_operations/render_test.rs
rename to crates/tinytools-std/src/filesystem/git_operations/render_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/glob_search/extra_test.rs b/crates/tinytools-std/src/filesystem/glob_search/extra_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/glob_search/extra_test.rs
rename to crates/tinytools-std/src/filesystem/glob_search/extra_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/glob_search/mod.rs b/crates/tinytools-std/src/filesystem/glob_search/mod.rs
index a2ef5c0..cac8f5b 100644
--- a/crates/tinytools-std/src/filesystem/glob_search/mod.rs
+++ b/crates/tinytools-std/src/filesystem/glob_search/mod.rs
@@ -320,7 +320,9 @@ fn is_skipped(name: &str) -> bool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "extra_tests.rs"]
 mod extra_test;
diff --git a/crates/tinytools-std/src/filesystem/glob_search/test.rs b/crates/tinytools-std/src/filesystem/glob_search/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/glob_search/test.rs
rename to crates/tinytools-std/src/filesystem/glob_search/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/grep/extra_test.rs b/crates/tinytools-std/src/filesystem/grep/extra_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/grep/extra_test.rs
rename to crates/tinytools-std/src/filesystem/grep/extra_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/grep/mod.rs b/crates/tinytools-std/src/filesystem/grep/mod.rs
index fec62f3..5ffbcb3 100644
--- a/crates/tinytools-std/src/filesystem/grep/mod.rs
+++ b/crates/tinytools-std/src/filesystem/grep/mod.rs
@@ -233,7 +233,9 @@ fn is_skipped(name: &str) -> bool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "extra_tests.rs"]
 mod extra_test;
diff --git a/crates/tinytools-std/src/filesystem/grep/test.rs b/crates/tinytools-std/src/filesystem/grep/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/grep/test.rs
rename to crates/tinytools-std/src/filesystem/grep/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/image_info/mod.rs b/crates/tinytools-std/src/filesystem/image_info/mod.rs
index 4773495..0d8e0bf 100644
--- a/crates/tinytools-std/src/filesystem/image_info/mod.rs
+++ b/crates/tinytools-std/src/filesystem/image_info/mod.rs
@@ -207,4 +207,5 @@ impl Tool for ImageInfoTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/image_info/test.rs b/crates/tinytools-std/src/filesystem/image_info/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/image_info/test.rs
rename to crates/tinytools-std/src/filesystem/image_info/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/list_files/extra_test.rs b/crates/tinytools-std/src/filesystem/list_files/extra_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/list_files/extra_test.rs
rename to crates/tinytools-std/src/filesystem/list_files/extra_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/list_files/mod.rs b/crates/tinytools-std/src/filesystem/list_files/mod.rs
index 672b60c..1a2172a 100644
--- a/crates/tinytools-std/src/filesystem/list_files/mod.rs
+++ b/crates/tinytools-std/src/filesystem/list_files/mod.rs
@@ -139,7 +139,9 @@ impl ListFilesTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "extra_tests.rs"]
 mod extra_test;
diff --git a/crates/tinytools-std/src/filesystem/list_files/test.rs b/crates/tinytools-std/src/filesystem/list_files/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/list_files/test.rs
rename to crates/tinytools-std/src/filesystem/list_files/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/mod.rs b/crates/tinytools-std/src/filesystem/mod.rs
index 1a1cb8a..4e92588 100644
--- a/crates/tinytools-std/src/filesystem/mod.rs
+++ b/crates/tinytools-std/src/filesystem/mod.rs
@@ -44,6 +44,7 @@ mod update_memory_md;
 mod workspace_state;
 
 #[cfg(test)]
+#[path = "gate_tests.rs"]
 mod gate_test;
 #[cfg(test)]
 mod test_support;
@@ -66,4 +67,5 @@ pub use update_memory_md::UpdateMemoryMdTool;
 pub use workspace_state::WorkspaceStateTool;
 
 #[cfg(test)]
+#[path = "contract_tests.rs"]
 mod contract_test;
diff --git a/crates/tinytools-std/src/filesystem/read_diff/mod.rs b/crates/tinytools-std/src/filesystem/read_diff/mod.rs
index 24df54c..c9d9936 100644
--- a/crates/tinytools-std/src/filesystem/read_diff/mod.rs
+++ b/crates/tinytools-std/src/filesystem/read_diff/mod.rs
@@ -135,4 +135,5 @@ impl Tool for ReadDiffTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/read_diff/test.rs b/crates/tinytools-std/src/filesystem/read_diff/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/read_diff/test.rs
rename to crates/tinytools-std/src/filesystem/read_diff/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/run_linter/mod.rs b/crates/tinytools-std/src/filesystem/run_linter/mod.rs
index 5839689..7527b3d 100644
--- a/crates/tinytools-std/src/filesystem/run_linter/mod.rs
+++ b/crates/tinytools-std/src/filesystem/run_linter/mod.rs
@@ -155,4 +155,5 @@ impl Tool for RunLinterTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/run_linter/test.rs b/crates/tinytools-std/src/filesystem/run_linter/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/run_linter/test.rs
rename to crates/tinytools-std/src/filesystem/run_linter/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/run_tests/mod.rs b/crates/tinytools-std/src/filesystem/run_tests/mod.rs
index 2bfa9e0..a522a68 100644
--- a/crates/tinytools-std/src/filesystem/run_tests/mod.rs
+++ b/crates/tinytools-std/src/filesystem/run_tests/mod.rs
@@ -196,4 +196,5 @@ impl Tool for RunTestsTool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/run_tests/test.rs b/crates/tinytools-std/src/filesystem/run_tests/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/run_tests/test.rs
rename to crates/tinytools-std/src/filesystem/run_tests/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/update_memory_md/mod.rs b/crates/tinytools-std/src/filesystem/update_memory_md/mod.rs
index 672cc0d..8797b20 100644
--- a/crates/tinytools-std/src/filesystem/update_memory_md/mod.rs
+++ b/crates/tinytools-std/src/filesystem/update_memory_md/mod.rs
@@ -409,4 +409,5 @@ async fn read_or_empty(path: &std::path::Path) -> anyhow::Result<String> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/update_memory_md/test.rs b/crates/tinytools-std/src/filesystem/update_memory_md/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/update_memory_md/test.rs
rename to crates/tinytools-std/src/filesystem/update_memory_md/mod_tests.rs
diff --git a/crates/tinytools-std/src/filesystem/workspace_state/mod.rs b/crates/tinytools-std/src/filesystem/workspace_state/mod.rs
index 9b61c25..7af822a 100644
--- a/crates/tinytools-std/src/filesystem/workspace_state/mod.rs
+++ b/crates/tinytools-std/src/filesystem/workspace_state/mod.rs
@@ -154,4 +154,5 @@ async fn run_git(dir: &std::path::Path, args: &[&str]) -> anyhow::Result<String>
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/filesystem/workspace_state/test.rs b/crates/tinytools-std/src/filesystem/workspace_state/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/filesystem/workspace_state/test.rs
rename to crates/tinytools-std/src/filesystem/workspace_state/mod_tests.rs
diff --git a/crates/tinytools-std/src/network/contract_test.rs b/crates/tinytools-std/src/network/contract_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/network/contract_test.rs
rename to crates/tinytools-std/src/network/contract_tests.rs
diff --git a/crates/tinytools-std/src/network/curl.rs b/crates/tinytools-std/src/network/curl.rs
index 7da5d7b..011db07 100644
--- a/crates/tinytools-std/src/network/curl.rs
+++ b/crates/tinytools-std/src/network/curl.rs
@@ -397,5 +397,5 @@ fn sanitize_dest_subdir(raw: &str) -> String {
 }
 
 #[cfg(test)]
-#[path = "curl_test.rs"]
+#[path = "curl_tests.rs"]
 mod tests;
diff --git a/crates/tinytools-std/src/network/curl_test.rs b/crates/tinytools-std/src/network/curl_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/network/curl_test.rs
rename to crates/tinytools-std/src/network/curl_tests.rs
diff --git a/crates/tinytools-std/src/network/http_request.rs b/crates/tinytools-std/src/network/http_request.rs
index 655f070..39aac65 100644
--- a/crates/tinytools-std/src/network/http_request.rs
+++ b/crates/tinytools-std/src/network/http_request.rs
@@ -425,5 +425,5 @@ impl Tool for HttpRequestTool {
 }
 
 #[cfg(test)]
-#[path = "http_request_test.rs"]
+#[path = "http_request_tests.rs"]
 mod tests;
diff --git a/crates/tinytools-std/src/network/http_request_test.rs b/crates/tinytools-std/src/network/http_request_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/network/http_request_test.rs
rename to crates/tinytools-std/src/network/http_request_tests.rs
diff --git a/crates/tinytools-std/src/network/mod.rs b/crates/tinytools-std/src/network/mod.rs
index 5453dcc..a964330 100644
--- a/crates/tinytools-std/src/network/mod.rs
+++ b/crates/tinytools-std/src/network/mod.rs
@@ -38,6 +38,7 @@ mod pushover;
 mod web_fetch;
 
 #[cfg(test)]
+#[path = "contract_tests.rs"]
 mod contract_test;
 #[cfg(test)]
 mod test_support;
diff --git a/crates/tinytools-std/src/network/pushover.rs b/crates/tinytools-std/src/network/pushover.rs
index 7e331ba..defd9bf 100644
--- a/crates/tinytools-std/src/network/pushover.rs
+++ b/crates/tinytools-std/src/network/pushover.rs
@@ -213,5 +213,5 @@ impl Tool for PushoverTool {
 }
 
 #[cfg(test)]
-#[path = "pushover_test.rs"]
+#[path = "pushover_tests.rs"]
 mod tests;
diff --git a/crates/tinytools-std/src/network/pushover_test.rs b/crates/tinytools-std/src/network/pushover_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/network/pushover_test.rs
rename to crates/tinytools-std/src/network/pushover_tests.rs
diff --git a/crates/tinytools-std/src/network/web_fetch.rs b/crates/tinytools-std/src/network/web_fetch.rs
index db08053..6bed91f 100644
--- a/crates/tinytools-std/src/network/web_fetch.rs
+++ b/crates/tinytools-std/src/network/web_fetch.rs
@@ -333,5 +333,5 @@ fn is_html(extractor: &dyn HtmlExtractor, body: &str, content_type: Option<&str>
 }
 
 #[cfg(test)]
-#[path = "web_fetch_test.rs"]
+#[path = "web_fetch_tests.rs"]
 mod tests;
diff --git a/crates/tinytools-std/src/network/web_fetch_test.rs b/crates/tinytools-std/src/network/web_fetch_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/network/web_fetch_test.rs
rename to crates/tinytools-std/src/network/web_fetch_tests.rs
diff --git a/crates/tinytools-std/src/url_guard/mod.rs b/crates/tinytools-std/src/url_guard/mod.rs
index 33c62df..ae996f8 100644
--- a/crates/tinytools-std/src/url_guard/mod.rs
+++ b/crates/tinytools-std/src/url_guard/mod.rs
@@ -479,4 +479,5 @@ pub fn is_non_global_v6(v6: std::net::Ipv6Addr) -> bool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools-std/src/url_guard/test.rs b/crates/tinytools-std/src/url_guard/mod_tests.rs
similarity index 100%
rename from crates/tinytools-std/src/url_guard/test.rs
rename to crates/tinytools-std/src/url_guard/mod_tests.rs
diff --git a/crates/tinytools/src/call/mod.rs b/crates/tinytools/src/call/mod.rs
index 7319b43..59fdcc8 100644
--- a/crates/tinytools/src/call/mod.rs
+++ b/crates/tinytools/src/call/mod.rs
@@ -11,4 +11,5 @@ pub use injected::{
 pub use types::{ToolCallOptions, ToolTimeout};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/call/test.rs b/crates/tinytools/src/call/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/call/test.rs
rename to crates/tinytools/src/call/mod_tests.rs
diff --git a/crates/tinytools/src/classification/mod.rs b/crates/tinytools/src/classification/mod.rs
index b2ff7f9..79f45da 100644
--- a/crates/tinytools/src/classification/mod.rs
+++ b/crates/tinytools/src/classification/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::{ToolCategory, ToolScope};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/classification/test.rs b/crates/tinytools/src/classification/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/classification/test.rs
rename to crates/tinytools/src/classification/mod_tests.rs
diff --git a/crates/tinytools/src/collapse/mod.rs b/crates/tinytools/src/collapse/mod.rs
index e4a8568..7e6e30a 100644
--- a/crates/tinytools/src/collapse/mod.rs
+++ b/crates/tinytools/src/collapse/mod.rs
@@ -504,4 +504,5 @@ pub fn args_without_action(args: &Value) -> Value {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/collapse/test.rs b/crates/tinytools/src/collapse/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/collapse/test.rs
rename to crates/tinytools/src/collapse/mod_tests.rs
diff --git a/crates/tinytools/src/command_output/mod.rs b/crates/tinytools/src/command_output/mod.rs
index 857fcad..2b07269 100644
--- a/crates/tinytools/src/command_output/mod.rs
+++ b/crates/tinytools/src/command_output/mod.rs
@@ -90,4 +90,5 @@ pub fn sandbox_exit_code(code: i32) -> Option<i32> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/command_output/test.rs b/crates/tinytools/src/command_output/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/command_output/test.rs
rename to crates/tinytools/src/command_output/mod_tests.rs
diff --git a/crates/tinytools/src/context/mod.rs b/crates/tinytools/src/context/mod.rs
index 9362b59..018dc49 100644
--- a/crates/tinytools/src/context/mod.rs
+++ b/crates/tinytools/src/context/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::ToolRunContext;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/context/test.rs b/crates/tinytools/src/context/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/context/test.rs
rename to crates/tinytools/src/context/mod_tests.rs
diff --git a/crates/tinytools/src/deferral/mod.rs b/crates/tinytools/src/deferral/mod.rs
index 9c8410d..2ffdecc 100644
--- a/crates/tinytools/src/deferral/mod.rs
+++ b/crates/tinytools/src/deferral/mod.rs
@@ -69,4 +69,5 @@ pub fn deferred_tool_names(tools: &[Box<dyn Tool>]) -> HashSet<String> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/deferral/test.rs b/crates/tinytools/src/deferral/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/deferral/test.rs
rename to crates/tinytools/src/deferral/mod_tests.rs
diff --git a/crates/tinytools/src/naming/mod.rs b/crates/tinytools/src/naming/mod.rs
index 3b2cb69..cc2cdd5 100644
--- a/crates/tinytools/src/naming/mod.rs
+++ b/crates/tinytools/src/naming/mod.rs
@@ -8,4 +8,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/naming/test.rs b/crates/tinytools/src/naming/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/naming/test.rs
rename to crates/tinytools/src/naming/mod_tests.rs
diff --git a/crates/tinytools/src/permission/mod.rs b/crates/tinytools/src/permission/mod.rs
index 7cdbbf3..474327b 100644
--- a/crates/tinytools/src/permission/mod.rs
+++ b/crates/tinytools/src/permission/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::PermissionLevel;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/permission/test.rs b/crates/tinytools/src/permission/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/permission/test.rs
rename to crates/tinytools/src/permission/mod_tests.rs
diff --git a/crates/tinytools/src/policy/mod.rs b/crates/tinytools/src/policy/mod.rs
index 417348b..26d5faf 100644
--- a/crates/tinytools/src/policy/mod.rs
+++ b/crates/tinytools/src/policy/mod.rs
@@ -11,4 +11,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/policy/test.rs b/crates/tinytools/src/policy/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/policy/test.rs
rename to crates/tinytools/src/policy/mod_tests.rs
diff --git a/crates/tinytools/src/rank/mod.rs b/crates/tinytools/src/rank/mod.rs
index 7b82213..56a709b 100644
--- a/crates/tinytools/src/rank/mod.rs
+++ b/crates/tinytools/src/rank/mod.rs
@@ -33,6 +33,7 @@
 
 mod bm25;
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 mod types;
 
diff --git a/crates/tinytools/src/rank/test.rs b/crates/tinytools/src/rank/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/rank/test.rs
rename to crates/tinytools/src/rank/mod_tests.rs
diff --git a/crates/tinytools/src/result/mod.rs b/crates/tinytools/src/result/mod.rs
index f5a6b9b..30882ab 100644
--- a/crates/tinytools/src/result/mod.rs
+++ b/crates/tinytools/src/result/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::{FileData, ImageData, ToolContent, ToolControl, ToolErrorKind, ToolResult};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/result/test.rs b/crates/tinytools/src/result/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/result/test.rs
rename to crates/tinytools/src/result/mod_tests.rs
diff --git a/crates/tinytools/src/spec/mod.rs b/crates/tinytools/src/spec/mod.rs
index 34a025a..41af8d5 100644
--- a/crates/tinytools/src/spec/mod.rs
+++ b/crates/tinytools/src/spec/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::ToolSpec;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/spec/test.rs b/crates/tinytools/src/spec/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/spec/test.rs
rename to crates/tinytools/src/spec/mod_tests.rs
diff --git a/crates/tinytools/src/tool/mod.rs b/crates/tinytools/src/tool/mod.rs
index c51bff9..3f1266d 100644
--- a/crates/tinytools/src/tool/mod.rs
+++ b/crates/tinytools/src/tool/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::{Tool, ToolExposure};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/tool/test.rs b/crates/tinytools/src/tool/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/tool/test.rs
rename to crates/tinytools/src/tool/mod_tests.rs
diff --git a/crates/tinytools/src/workspace/mod.rs b/crates/tinytools/src/workspace/mod.rs
index 60e712c..b4e9a3c 100644
--- a/crates/tinytools/src/workspace/mod.rs
+++ b/crates/tinytools/src/workspace/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::{SandboxMode, WorkspaceDescriptor};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinytools/src/workspace/test.rs b/crates/tinytools/src/workspace/mod_tests.rs
similarity index 100%
rename from crates/tinytools/src/workspace/test.rs
rename to crates/tinytools/src/workspace/mod_tests.rs