diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index e4fc8e6e5..6b7826fe2 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -2400,14 +2400,6 @@ pub fn render_frame(project: &Project, comp: ItemId, t: Tick, scale: f64) -> Ima
 
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_auto;
-#[cfg(test)]
-mod tests_remap;
-#[cfg(test)]
-mod tests_roi;
-#[cfg(test)]
-mod tests_styles;
 
 /// Layer-space bounds `[x0, y0, x1, y1]` of a layer's content at the context time (source size
 /// for solids/footage/precomps, glyph bounds for text, painted bounds for shapes). Used for viewer
@@ -2432,29 +2424,3 @@ pub fn content_bounds(ctx: &EvalCtx, layer: &effectcraft_project::Layer) -> Opti
 pub fn kurbo_path(sp: &effectcraft_keyframe::ShapePath) -> kurbo::BezPath {
     effectcraft_path::to_kurbo(sp)
 }
-#[cfg(test)]
-mod tests_audio_fx;
-#[cfg(test)]
-mod tests_aux;
-#[cfg(test)]
-mod tests_collapse;
-#[cfg(test)]
-mod tests_color;
-#[cfg(test)]
-mod tests_footage_size;
-#[cfg(test)]
-mod tests_frame_blend;
-#[cfg(test)]
-mod tests_guides;
-#[cfg(test)]
-mod tests_mask_blur;
-#[cfg(test)]
-mod tests_mask_expansion;
-#[cfg(test)]
-mod tests_motion_tile;
-#[cfg(test)]
-mod tests_nested;
-#[cfg(test)]
-mod tests_paint;
-#[cfg(test)]
-mod tests_time;
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
index 100ceda2f..5148f73f3 100644
--- a/crates/render/src/tests.rs
+++ b/crates/render/src/tests.rs
@@ -6,6 +6,24 @@ use effectcraft_time::{FrameRate, Tick};
 
 use crate::render_frame;
 
+mod auto;
+mod remap;
+mod roi;
+mod styles;
+mod audio_fx;
+mod aux_channels;
+mod collapse;
+mod color;
+mod footage_size;
+mod frame_blend;
+mod guides;
+mod mask_blur;
+mod mask_expansion;
+mod motion_tile;
+mod nested;
+mod paint;
+mod time;
+
 fn setup() -> (Project, ItemId, Comp) {
     let mut p = Project::default();
     // Exact float maths; 8/16 bpc quantisation has its own tests (tests_color).
diff --git a/crates/render/src/tests_audio_fx.rs b/crates/render/src/tests/audio_fx.rs
similarity index 100%
rename from crates/render/src/tests_audio_fx.rs
rename to crates/render/src/tests/audio_fx.rs
diff --git a/crates/render/src/tests_auto.rs b/crates/render/src/tests/auto.rs
similarity index 100%
rename from crates/render/src/tests_auto.rs
rename to crates/render/src/tests/auto.rs
diff --git a/crates/render/src/tests_aux.rs b/crates/render/src/tests/aux_channels.rs
similarity index 100%
rename from crates/render/src/tests_aux.rs
rename to crates/render/src/tests/aux_channels.rs
diff --git a/crates/render/src/tests_collapse.rs b/crates/render/src/tests/collapse.rs
similarity index 100%
rename from crates/render/src/tests_collapse.rs
rename to crates/render/src/tests/collapse.rs
diff --git a/crates/render/src/tests_color.rs b/crates/render/src/tests/color.rs
similarity index 100%
rename from crates/render/src/tests_color.rs
rename to crates/render/src/tests/color.rs
diff --git a/crates/render/src/tests_footage_size.rs b/crates/render/src/tests/footage_size.rs
similarity index 100%
rename from crates/render/src/tests_footage_size.rs
rename to crates/render/src/tests/footage_size.rs
diff --git a/crates/render/src/tests_frame_blend.rs b/crates/render/src/tests/frame_blend.rs
similarity index 100%
rename from crates/render/src/tests_frame_blend.rs
rename to crates/render/src/tests/frame_blend.rs
diff --git a/crates/render/src/tests_guides.rs b/crates/render/src/tests/guides.rs
similarity index 100%
rename from crates/render/src/tests_guides.rs
rename to crates/render/src/tests/guides.rs
diff --git a/crates/render/src/tests_mask_blur.rs b/crates/render/src/tests/mask_blur.rs
similarity index 100%
rename from crates/render/src/tests_mask_blur.rs
rename to crates/render/src/tests/mask_blur.rs
diff --git a/crates/render/src/tests_mask_expansion.rs b/crates/render/src/tests/mask_expansion.rs
similarity index 100%
rename from crates/render/src/tests_mask_expansion.rs
rename to crates/render/src/tests/mask_expansion.rs
diff --git a/crates/render/src/tests_motion_tile.rs b/crates/render/src/tests/motion_tile.rs
similarity index 100%
rename from crates/render/src/tests_motion_tile.rs
rename to crates/render/src/tests/motion_tile.rs
diff --git a/crates/render/src/tests_nested.rs b/crates/render/src/tests/nested.rs
similarity index 100%
rename from crates/render/src/tests_nested.rs
rename to crates/render/src/tests/nested.rs
diff --git a/crates/render/src/tests_paint.rs b/crates/render/src/tests/paint.rs
similarity index 100%
rename from crates/render/src/tests_paint.rs
rename to crates/render/src/tests/paint.rs
diff --git a/crates/render/src/tests_remap.rs b/crates/render/src/tests/remap.rs
similarity index 100%
rename from crates/render/src/tests_remap.rs
rename to crates/render/src/tests/remap.rs
diff --git a/crates/render/src/tests_roi.rs b/crates/render/src/tests/roi.rs
similarity index 100%
rename from crates/render/src/tests_roi.rs
rename to crates/render/src/tests/roi.rs
diff --git a/crates/render/src/tests_styles.rs b/crates/render/src/tests/styles.rs
similarity index 100%
rename from crates/render/src/tests_styles.rs
rename to crates/render/src/tests/styles.rs
diff --git a/crates/render/src/tests_time.rs b/crates/render/src/tests/time.rs
similarity index 100%
rename from crates/render/src/tests_time.rs
rename to crates/render/src/tests/time.rs