diff --git a/gix-refspec/tests/impls/mod.rs b/gix-refspec/tests/refspec/impls.rs
similarity index 100%
rename from gix-refspec/tests/impls/mod.rs
rename to gix-refspec/tests/refspec/impls.rs
diff --git a/gix-refspec/tests/refspec.rs b/gix-refspec/tests/refspec/main.rs
similarity index 100%
rename from gix-refspec/tests/refspec.rs
rename to gix-refspec/tests/refspec/main.rs
diff --git a/gix-refspec/tests/match_group/mod.rs b/gix-refspec/tests/refspec/match_group.rs
similarity index 100%
rename from gix-refspec/tests/match_group/mod.rs
rename to gix-refspec/tests/refspec/match_group.rs
diff --git a/gix-refspec/tests/matching/mod.rs b/gix-refspec/tests/refspec/matching.rs
similarity index 100%
rename from gix-refspec/tests/matching/mod.rs
rename to gix-refspec/tests/refspec/matching.rs
diff --git a/gix-refspec/tests/parse/fetch.rs b/gix-refspec/tests/refspec/parse/fetch.rs
similarity index 100%
rename from gix-refspec/tests/parse/fetch.rs
rename to gix-refspec/tests/refspec/parse/fetch.rs
diff --git a/gix-refspec/tests/parse/invalid.rs b/gix-refspec/tests/refspec/parse/invalid.rs
similarity index 93%
rename from gix-refspec/tests/parse/invalid.rs
rename to gix-refspec/tests/refspec/parse/invalid.rs
index 7286e186a43..db591d2e0b3 100644
--- a/gix-refspec/tests/parse/invalid.rs
+++ b/gix-refspec/tests/refspec/parse/invalid.rs
@@ -64,7 +64,8 @@ fn push_to_empty() {
 
 #[test]
 fn fuzzed() {
-    let input = include_bytes!("../fixtures/fuzzed/clusterfuzz-testcase-minimized-gix-refspec-parse-4658733962887168");
+    let input =
+        include_bytes!("../../fixtures/fuzzed/clusterfuzz-testcase-minimized-gix-refspec-parse-4658733962887168");
     drop(gix_refspec::parse(input.into(), gix_refspec::parse::Operation::Fetch).unwrap_err());
     drop(gix_refspec::parse(input.into(), gix_refspec::parse::Operation::Push).unwrap_err());
 }
diff --git a/gix-refspec/tests/parse/mod.rs b/gix-refspec/tests/refspec/parse/mod.rs
similarity index 100%
rename from gix-refspec/tests/parse/mod.rs
rename to gix-refspec/tests/refspec/parse/mod.rs
diff --git a/gix-refspec/tests/parse/push.rs b/gix-refspec/tests/refspec/parse/push.rs
similarity index 100%
rename from gix-refspec/tests/parse/push.rs
rename to gix-refspec/tests/refspec/parse/push.rs
diff --git a/gix-refspec/tests/spec/mod.rs b/gix-refspec/tests/refspec/spec.rs
similarity index 100%
rename from gix-refspec/tests/spec/mod.rs
rename to gix-refspec/tests/refspec/spec.rs
diff --git a/gix-refspec/tests/write/mod.rs b/gix-refspec/tests/refspec/write.rs
similarity index 100%
rename from gix-refspec/tests/write/mod.rs
rename to gix-refspec/tests/refspec/write.rs