diff --git a/crates/pdf/src/lib.rs b/crates/pdf/src/lib.rs
index bfb04ab82..95a0260c6 100644
--- a/crates/pdf/src/lib.rs
+++ b/crates/pdf/src/lib.rs
@@ -244,77 +244,7 @@ impl From<craft_pdf::write::WriteError> for PdfError {
     }
 }
 
+#[cfg(test)]
+use tests::{import_fidelity as tests_import_fidelity, live_text as tests_live_text, stroke as tests_stroke};
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_blend;
-#[cfg(test)]
-mod tests_charstroke;
-#[cfg(test)]
-mod tests_cmykblend;
-#[cfg(test)]
-mod tests_cmykimages;
-#[cfg(test)]
-mod tests_compression;
-#[cfg(test)]
-mod tests_dashalign;
-#[cfg(test)]
-mod tests_editing;
-#[cfg(test)]
-mod tests_encrypt;
-#[cfg(test)]
-mod tests_file_info;
-#[cfg(test)]
-mod tests_focal;
-#[cfg(test)]
-mod tests_fx;
-#[cfg(test)]
-mod tests_import_color;
-#[cfg(test)]
-mod tests_import_fidelity;
-#[cfg(test)]
-mod tests_import_layers;
-#[cfg(test)]
-mod tests_import_lines;
-#[cfg(test)]
-mod tests_import_options;
-#[cfg(test)]
-mod tests_import_overprint;
-#[cfg(test)]
-mod tests_layers;
-#[cfg(test)]
-mod tests_live_text;
-#[cfg(test)]
-mod tests_marks;
-#[cfg(test)]
-mod tests_output;
-#[cfg(test)]
-mod tests_pdf13;
-#[cfg(test)]
-mod tests_pdfx;
-#[cfg(test)]
-mod tests_presets;
-#[cfg(test)]
-mod tests_print;
-#[cfg(test)]
-mod tests_printadvanced;
-#[cfg(test)]
-mod tests_realtext;
-#[cfg(test)]
-mod tests_settings;
-#[cfg(test)]
-mod tests_stroke;
-#[cfg(test)]
-mod tests_strokeout;
-#[cfg(test)]
-mod tests_text_placement;
-#[cfg(test)]
-mod tests_textstroke;
-#[cfg(test)]
-mod tests_webview;
-
-#[cfg(test)]
-mod tests_reader_streaming;
-
-#[cfg(test)]
-mod tests_reader_compat;
diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs
index 6ebc0ceac..e76589fcf 100644
--- a/crates/pdf/src/tests.rs
+++ b/crates/pdf/src/tests.rs
@@ -8,6 +8,42 @@ use vectorcraft_geom::{Affine, FillRule, PathData, Point, Rect, shapes};
 
 use crate::*;
 
+mod blend;
+mod charstroke;
+mod cmykblend;
+mod cmykimages;
+mod compression;
+mod dashalign;
+mod editing;
+mod encrypt;
+mod file_info;
+mod focal;
+mod fx;
+mod import_color;
+pub(super) mod import_fidelity;
+mod import_layers;
+mod import_lines;
+mod import_options;
+mod import_overprint;
+mod layers;
+pub(super) mod live_text;
+mod marks;
+mod output;
+mod pdf13;
+mod pdfx;
+mod presets;
+mod print;
+mod printadvanced;
+mod realtext;
+mod settings;
+pub(super) mod stroke;
+mod strokeout;
+mod text_placement;
+mod textstroke;
+mod webview;
+mod reader_streaming;
+mod reader_compat;
+
 fn doc(w: f64, h: f64) -> Document {
     Document::new(w, h)
 }
diff --git a/crates/pdf/src/tests_blend.rs b/crates/pdf/src/tests/blend.rs
similarity index 100%
rename from crates/pdf/src/tests_blend.rs
rename to crates/pdf/src/tests/blend.rs
diff --git a/crates/pdf/src/tests_charstroke.rs b/crates/pdf/src/tests/charstroke.rs
similarity index 100%
rename from crates/pdf/src/tests_charstroke.rs
rename to crates/pdf/src/tests/charstroke.rs
diff --git a/crates/pdf/src/tests_cmykblend.rs b/crates/pdf/src/tests/cmykblend.rs
similarity index 100%
rename from crates/pdf/src/tests_cmykblend.rs
rename to crates/pdf/src/tests/cmykblend.rs
diff --git a/crates/pdf/src/tests_cmykimages.rs b/crates/pdf/src/tests/cmykimages.rs
similarity index 100%
rename from crates/pdf/src/tests_cmykimages.rs
rename to crates/pdf/src/tests/cmykimages.rs
diff --git a/crates/pdf/src/tests_compression.rs b/crates/pdf/src/tests/compression.rs
similarity index 100%
rename from crates/pdf/src/tests_compression.rs
rename to crates/pdf/src/tests/compression.rs
diff --git a/crates/pdf/src/tests_dashalign.rs b/crates/pdf/src/tests/dashalign.rs
similarity index 100%
rename from crates/pdf/src/tests_dashalign.rs
rename to crates/pdf/src/tests/dashalign.rs
diff --git a/crates/pdf/src/tests_editing.rs b/crates/pdf/src/tests/editing.rs
similarity index 100%
rename from crates/pdf/src/tests_editing.rs
rename to crates/pdf/src/tests/editing.rs
diff --git a/crates/pdf/src/tests_encrypt.rs b/crates/pdf/src/tests/encrypt.rs
similarity index 100%
rename from crates/pdf/src/tests_encrypt.rs
rename to crates/pdf/src/tests/encrypt.rs
diff --git a/crates/pdf/src/tests_file_info.rs b/crates/pdf/src/tests/file_info.rs
similarity index 100%
rename from crates/pdf/src/tests_file_info.rs
rename to crates/pdf/src/tests/file_info.rs
diff --git a/crates/pdf/src/tests_focal.rs b/crates/pdf/src/tests/focal.rs
similarity index 100%
rename from crates/pdf/src/tests_focal.rs
rename to crates/pdf/src/tests/focal.rs
diff --git a/crates/pdf/src/tests_fx.rs b/crates/pdf/src/tests/fx.rs
similarity index 100%
rename from crates/pdf/src/tests_fx.rs
rename to crates/pdf/src/tests/fx.rs
diff --git a/crates/pdf/src/tests_import_color.rs b/crates/pdf/src/tests/import_color.rs
similarity index 100%
rename from crates/pdf/src/tests_import_color.rs
rename to crates/pdf/src/tests/import_color.rs
diff --git a/crates/pdf/src/tests_import_fidelity.rs b/crates/pdf/src/tests/import_fidelity.rs
similarity index 100%
rename from crates/pdf/src/tests_import_fidelity.rs
rename to crates/pdf/src/tests/import_fidelity.rs
diff --git a/crates/pdf/src/tests_import_layers.rs b/crates/pdf/src/tests/import_layers.rs
similarity index 100%
rename from crates/pdf/src/tests_import_layers.rs
rename to crates/pdf/src/tests/import_layers.rs
diff --git a/crates/pdf/src/tests_import_lines.rs b/crates/pdf/src/tests/import_lines.rs
similarity index 100%
rename from crates/pdf/src/tests_import_lines.rs
rename to crates/pdf/src/tests/import_lines.rs
diff --git a/crates/pdf/src/tests_import_options.rs b/crates/pdf/src/tests/import_options.rs
similarity index 100%
rename from crates/pdf/src/tests_import_options.rs
rename to crates/pdf/src/tests/import_options.rs
diff --git a/crates/pdf/src/tests_import_overprint.rs b/crates/pdf/src/tests/import_overprint.rs
similarity index 100%
rename from crates/pdf/src/tests_import_overprint.rs
rename to crates/pdf/src/tests/import_overprint.rs
diff --git a/crates/pdf/src/tests_layers.rs b/crates/pdf/src/tests/layers.rs
similarity index 100%
rename from crates/pdf/src/tests_layers.rs
rename to crates/pdf/src/tests/layers.rs
diff --git a/crates/pdf/src/tests_live_text.rs b/crates/pdf/src/tests/live_text.rs
similarity index 99%
rename from crates/pdf/src/tests_live_text.rs
rename to crates/pdf/src/tests/live_text.rs
index 19b198253..4cb4417bc 100644
--- a/crates/pdf/src/tests_live_text.rs
+++ b/crates/pdf/src/tests/live_text.rs
@@ -9,8 +9,8 @@ use vectorcraft_doc::{Document, NodeKind, TextObject};
 
 use crate::*;
 
-const SOURCE_SANS: &[u8] = include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf");
-const SOURCE_SERIF: &[u8] = include_bytes!("../../../assets/fonts/SourceSerif4-Regular.ttf");
+const SOURCE_SANS: &[u8] = include_bytes!("../../../../assets/fonts/SourceSans3-Regular.ttf");
+const SOURCE_SERIF: &[u8] = include_bytes!("../../../../assets/fonts/SourceSerif4-Regular.ttf");
 
 /// A 300 × 200 pt page with `lines` of (x, y from the top, size, text) in Source Sans 3, and the
 /// same rotated 90° when `rotated`.
diff --git a/crates/pdf/src/tests_marks.rs b/crates/pdf/src/tests/marks.rs
similarity index 100%
rename from crates/pdf/src/tests_marks.rs
rename to crates/pdf/src/tests/marks.rs
diff --git a/crates/pdf/src/tests_output.rs b/crates/pdf/src/tests/output.rs
similarity index 100%
rename from crates/pdf/src/tests_output.rs
rename to crates/pdf/src/tests/output.rs
diff --git a/crates/pdf/src/tests_pdf13.rs b/crates/pdf/src/tests/pdf13.rs
similarity index 100%
rename from crates/pdf/src/tests_pdf13.rs
rename to crates/pdf/src/tests/pdf13.rs
diff --git a/crates/pdf/src/tests_pdfx.rs b/crates/pdf/src/tests/pdfx.rs
similarity index 100%
rename from crates/pdf/src/tests_pdfx.rs
rename to crates/pdf/src/tests/pdfx.rs
diff --git a/crates/pdf/src/tests_presets.rs b/crates/pdf/src/tests/presets.rs
similarity index 100%
rename from crates/pdf/src/tests_presets.rs
rename to crates/pdf/src/tests/presets.rs
diff --git a/crates/pdf/src/tests_print.rs b/crates/pdf/src/tests/print.rs
similarity index 100%
rename from crates/pdf/src/tests_print.rs
rename to crates/pdf/src/tests/print.rs
diff --git a/crates/pdf/src/tests_printadvanced.rs b/crates/pdf/src/tests/printadvanced.rs
similarity index 100%
rename from crates/pdf/src/tests_printadvanced.rs
rename to crates/pdf/src/tests/printadvanced.rs
diff --git a/crates/pdf/src/tests_reader_compat.rs b/crates/pdf/src/tests/reader_compat.rs
similarity index 99%
rename from crates/pdf/src/tests_reader_compat.rs
rename to crates/pdf/src/tests/reader_compat.rs
index 83933393e..d292a0319 100644
--- a/crates/pdf/src/tests_reader_compat.rs
+++ b/crates/pdf/src/tests/reader_compat.rs
@@ -5,7 +5,7 @@ use vectorcraft_doc::{Document, NodeKind};
 
 use crate::{ImportOptions, TextAs, import_with_report};
 
-const INTER: &[u8] = include_bytes!("../../../assets/fonts/Inter-Regular.ttf");
+const INTER: &[u8] = include_bytes!("../../../../assets/fonts/Inter-Regular.ttf");
 
 fn stream(dictionary: &str, content: &[u8]) -> Vec<u8> {
     let mut bytes = format!("<< {dictionary} /Length {} >>\nstream\n", content.len()).into_bytes();
diff --git a/crates/pdf/src/tests_reader_streaming.rs b/crates/pdf/src/tests/reader_streaming.rs
similarity index 100%
rename from crates/pdf/src/tests_reader_streaming.rs
rename to crates/pdf/src/tests/reader_streaming.rs
diff --git a/crates/pdf/src/tests_realtext.rs b/crates/pdf/src/tests/realtext.rs
similarity index 100%
rename from crates/pdf/src/tests_realtext.rs
rename to crates/pdf/src/tests/realtext.rs
diff --git a/crates/pdf/src/tests_settings.rs b/crates/pdf/src/tests/settings.rs
similarity index 100%
rename from crates/pdf/src/tests_settings.rs
rename to crates/pdf/src/tests/settings.rs
diff --git a/crates/pdf/src/tests_stroke.rs b/crates/pdf/src/tests/stroke.rs
similarity index 100%
rename from crates/pdf/src/tests_stroke.rs
rename to crates/pdf/src/tests/stroke.rs
diff --git a/crates/pdf/src/tests_strokeout.rs b/crates/pdf/src/tests/strokeout.rs
similarity index 100%
rename from crates/pdf/src/tests_strokeout.rs
rename to crates/pdf/src/tests/strokeout.rs
diff --git a/crates/pdf/src/tests_text_placement.rs b/crates/pdf/src/tests/text_placement.rs
similarity index 99%
rename from crates/pdf/src/tests_text_placement.rs
rename to crates/pdf/src/tests/text_placement.rs
index fc0057a90..45bf5e409 100644
--- a/crates/pdf/src/tests_text_placement.rs
+++ b/crates/pdf/src/tests/text_placement.rs
@@ -14,7 +14,7 @@ use vectorcraft_text::{FontDb, FontFace};
 use crate::tests_import_fidelity::stream;
 use crate::*;
 
-const SOURCE_SANS: &[u8] = include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf");
+const SOURCE_SANS: &[u8] = include_bytes!("../../../../assets/fonts/SourceSans3-Regular.ttf");
 
 fn sans() -> Arc<FontFace> {
     FontDb::global().find_postscript("SourceSans3-Regular").expect("Source Sans 3 is built in")
diff --git a/crates/pdf/src/tests_textstroke.rs b/crates/pdf/src/tests/textstroke.rs
similarity index 100%
rename from crates/pdf/src/tests_textstroke.rs
rename to crates/pdf/src/tests/textstroke.rs
diff --git a/crates/pdf/src/tests_webview.rs b/crates/pdf/src/tests/webview.rs
similarity index 100%
rename from crates/pdf/src/tests_webview.rs
rename to crates/pdf/src/tests/webview.rs