diff --git a/gix-url/tests/access/mod.rs b/gix-url/tests/url/access.rs
similarity index 100%
rename from gix-url/tests/access/mod.rs
rename to gix-url/tests/url/access.rs
diff --git a/gix-url/tests/baseline.rs b/gix-url/tests/url/baseline.rs
similarity index 99%
rename from gix-url/tests/baseline.rs
rename to gix-url/tests/url/baseline.rs
index 99b0870549f..1186fa2366a 100644
--- a/gix-url/tests/baseline.rs
+++ b/gix-url/tests/url/baseline.rs
@@ -164,6 +164,7 @@ fn assert_urls_equal(expected: &baseline::GitDiagUrl<'_>, actual: &gix_url::Url)
     assert_eq!(actual.path, expected.path.unwrap_or_default());
 }
 
+#[allow(clippy::module_inception)]
 mod baseline {
     use bstr::{BStr, BString, ByteSlice};
     use gix_testtools::once_cell::sync::Lazy;
diff --git a/gix-url/tests/expand_path/mod.rs b/gix-url/tests/url/expand_path.rs
similarity index 100%
rename from gix-url/tests/expand_path/mod.rs
rename to gix-url/tests/url/expand_path.rs
diff --git a/gix-url/tests/fuzzed.rs b/gix-url/tests/url/fuzzed.rs
similarity index 100%
rename from gix-url/tests/fuzzed.rs
rename to gix-url/tests/url/fuzzed.rs
diff --git a/gix-url/tests/url.rs b/gix-url/tests/url/main.rs
similarity index 83%
rename from gix-url/tests/url.rs
rename to gix-url/tests/url/main.rs
index 9efd0163648..d25742b2120 100644
--- a/gix-url/tests/url.rs
+++ b/gix-url/tests/url/main.rs
@@ -2,5 +2,7 @@ pub type Error = Box<dyn std::error::Error>;
 pub type Result = std::result::Result<(), Error>;
 
 mod access;
+mod baseline;
 mod expand_path;
+mod fuzzed;
 mod parse;
diff --git a/gix-url/tests/parse/file.rs b/gix-url/tests/url/parse/file.rs
similarity index 100%
rename from gix-url/tests/parse/file.rs
rename to gix-url/tests/url/parse/file.rs
diff --git a/gix-url/tests/parse/http.rs b/gix-url/tests/url/parse/http.rs
similarity index 100%
rename from gix-url/tests/parse/http.rs
rename to gix-url/tests/url/parse/http.rs
diff --git a/gix-url/tests/parse/invalid.rs b/gix-url/tests/url/parse/invalid.rs
similarity index 100%
rename from gix-url/tests/parse/invalid.rs
rename to gix-url/tests/url/parse/invalid.rs
diff --git a/gix-url/tests/parse/mod.rs b/gix-url/tests/url/parse/mod.rs
similarity index 100%
rename from gix-url/tests/parse/mod.rs
rename to gix-url/tests/url/parse/mod.rs
diff --git a/gix-url/tests/parse/ssh.rs b/gix-url/tests/url/parse/ssh.rs
similarity index 100%
rename from gix-url/tests/parse/ssh.rs
rename to gix-url/tests/url/parse/ssh.rs