diff --git a/clutter/meson.build b/clutter/meson.build
index bd9f06e74..298d6f177 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -86,6 +86,3 @@ clutter_deps = [
 
 subdir('clutter')
 
-#if have_clutter_tests
-#  subdir('tests')
-#endif
diff --git a/clutter/tests/README b/src/tests/clutter/README
similarity index 100%
rename from clutter/tests/README
rename to src/tests/clutter/README
diff --git a/clutter/tests/accessibility/.gitignore b/src/tests/clutter/accessibility/.gitignore
similarity index 100%
rename from clutter/tests/accessibility/.gitignore
rename to src/tests/clutter/accessibility/.gitignore
diff --git a/clutter/tests/accessibility/cally-atkcomponent-example.c b/src/tests/clutter/accessibility/cally-atkcomponent-example.c
similarity index 100%
rename from clutter/tests/accessibility/cally-atkcomponent-example.c
rename to src/tests/clutter/accessibility/cally-atkcomponent-example.c
diff --git a/clutter/tests/accessibility/cally-atkeditabletext-example.c b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c
similarity index 100%
rename from clutter/tests/accessibility/cally-atkeditabletext-example.c
rename to src/tests/clutter/accessibility/cally-atkeditabletext-example.c
diff --git a/clutter/tests/accessibility/cally-atkevents-example.c b/src/tests/clutter/accessibility/cally-atkevents-example.c
similarity index 100%
rename from clutter/tests/accessibility/cally-atkevents-example.c
rename to src/tests/clutter/accessibility/cally-atkevents-example.c
diff --git a/clutter/tests/accessibility/cally-atktext-example.c b/src/tests/clutter/accessibility/cally-atktext-example.c
similarity index 100%
rename from clutter/tests/accessibility/cally-atktext-example.c
rename to src/tests/clutter/accessibility/cally-atktext-example.c
diff --git a/clutter/tests/accessibility/cally-clone-example.c b/src/tests/clutter/accessibility/cally-clone-example.c
similarity index 100%
rename from clutter/tests/accessibility/cally-clone-example.c
rename to src/tests/clutter/accessibility/cally-clone-example.c
diff --git a/clutter/tests/accessibility/cally-examples-util.c b/src/tests/clutter/accessibility/cally-examples-util.c
similarity index 100%
rename from clutter/tests/accessibility/cally-examples-util.c
rename to src/tests/clutter/accessibility/cally-examples-util.c
diff --git a/clutter/tests/accessibility/cally-examples-util.h b/src/tests/clutter/accessibility/cally-examples-util.h
similarity index 100%
rename from clutter/tests/accessibility/cally-examples-util.h
rename to src/tests/clutter/accessibility/cally-examples-util.h
diff --git a/clutter/tests/accessibility/meson.build b/src/tests/clutter/accessibility/meson.build
similarity index 100%
rename from clutter/tests/accessibility/meson.build
rename to src/tests/clutter/accessibility/meson.build
diff --git a/clutter/tests/clutter-1.0.suppressions b/src/tests/clutter/clutter-1.0.suppressions
similarity index 100%
rename from clutter/tests/clutter-1.0.suppressions
rename to src/tests/clutter/clutter-1.0.suppressions
diff --git a/clutter/tests/conform/actor-anchors.c b/src/tests/clutter/conform/actor-anchors.c
similarity index 100%
rename from clutter/tests/conform/actor-anchors.c
rename to src/tests/clutter/conform/actor-anchors.c
diff --git a/clutter/tests/conform/actor-destroy.c b/src/tests/clutter/conform/actor-destroy.c
similarity index 100%
rename from clutter/tests/conform/actor-destroy.c
rename to src/tests/clutter/conform/actor-destroy.c
diff --git a/clutter/tests/conform/actor-graph.c b/src/tests/clutter/conform/actor-graph.c
similarity index 100%
rename from clutter/tests/conform/actor-graph.c
rename to src/tests/clutter/conform/actor-graph.c
diff --git a/clutter/tests/conform/actor-invariants.c b/src/tests/clutter/conform/actor-invariants.c
similarity index 100%
rename from clutter/tests/conform/actor-invariants.c
rename to src/tests/clutter/conform/actor-invariants.c
diff --git a/clutter/tests/conform/actor-iter.c b/src/tests/clutter/conform/actor-iter.c
similarity index 100%
rename from clutter/tests/conform/actor-iter.c
rename to src/tests/clutter/conform/actor-iter.c
diff --git a/clutter/tests/conform/actor-layout.c b/src/tests/clutter/conform/actor-layout.c
similarity index 100%
rename from clutter/tests/conform/actor-layout.c
rename to src/tests/clutter/conform/actor-layout.c
diff --git a/clutter/tests/conform/actor-meta.c b/src/tests/clutter/conform/actor-meta.c
similarity index 100%
rename from clutter/tests/conform/actor-meta.c
rename to src/tests/clutter/conform/actor-meta.c
diff --git a/clutter/tests/conform/actor-offscreen-redirect.c b/src/tests/clutter/conform/actor-offscreen-redirect.c
similarity index 100%
rename from clutter/tests/conform/actor-offscreen-redirect.c
rename to src/tests/clutter/conform/actor-offscreen-redirect.c
diff --git a/clutter/tests/conform/actor-paint-opacity.c b/src/tests/clutter/conform/actor-paint-opacity.c
similarity index 100%
rename from clutter/tests/conform/actor-paint-opacity.c
rename to src/tests/clutter/conform/actor-paint-opacity.c
diff --git a/clutter/tests/conform/actor-pick.c b/src/tests/clutter/conform/actor-pick.c
similarity index 100%
rename from clutter/tests/conform/actor-pick.c
rename to src/tests/clutter/conform/actor-pick.c
diff --git a/clutter/tests/conform/actor-shader-effect.c b/src/tests/clutter/conform/actor-shader-effect.c
similarity index 100%
rename from clutter/tests/conform/actor-shader-effect.c
rename to src/tests/clutter/conform/actor-shader-effect.c
diff --git a/clutter/tests/conform/actor-size.c b/src/tests/clutter/conform/actor-size.c
similarity index 100%
rename from clutter/tests/conform/actor-size.c
rename to src/tests/clutter/conform/actor-size.c
diff --git a/clutter/tests/conform/behaviours.c b/src/tests/clutter/conform/behaviours.c
similarity index 100%
rename from clutter/tests/conform/behaviours.c
rename to src/tests/clutter/conform/behaviours.c
diff --git a/clutter/tests/conform/binding-pool.c b/src/tests/clutter/conform/binding-pool.c
similarity index 100%
rename from clutter/tests/conform/binding-pool.c
rename to src/tests/clutter/conform/binding-pool.c
diff --git a/clutter/tests/conform/cairo-texture.c b/src/tests/clutter/conform/cairo-texture.c
similarity index 100%
rename from clutter/tests/conform/cairo-texture.c
rename to src/tests/clutter/conform/cairo-texture.c
diff --git a/clutter/tests/conform/cally-text.c b/src/tests/clutter/conform/cally-text.c
similarity index 100%
rename from clutter/tests/conform/cally-text.c
rename to src/tests/clutter/conform/cally-text.c
diff --git a/clutter/tests/conform/color.c b/src/tests/clutter/conform/color.c
similarity index 100%
rename from clutter/tests/conform/color.c
rename to src/tests/clutter/conform/color.c
diff --git a/clutter/tests/conform/group.c b/src/tests/clutter/conform/group.c
similarity index 100%
rename from clutter/tests/conform/group.c
rename to src/tests/clutter/conform/group.c
diff --git a/clutter/tests/conform/interval.c b/src/tests/clutter/conform/interval.c
similarity index 100%
rename from clutter/tests/conform/interval.c
rename to src/tests/clutter/conform/interval.c
diff --git a/clutter/tests/conform/meson.build b/src/tests/clutter/conform/meson.build
similarity index 100%
rename from clutter/tests/conform/meson.build
rename to src/tests/clutter/conform/meson.build
diff --git a/clutter/tests/conform/path.c b/src/tests/clutter/conform/path.c
similarity index 100%
rename from clutter/tests/conform/path.c
rename to src/tests/clutter/conform/path.c
diff --git a/clutter/tests/conform/rectangle.c b/src/tests/clutter/conform/rectangle.c
similarity index 100%
rename from clutter/tests/conform/rectangle.c
rename to src/tests/clutter/conform/rectangle.c
diff --git a/clutter/tests/conform/script-parser.c b/src/tests/clutter/conform/script-parser.c
similarity index 100%
rename from clutter/tests/conform/script-parser.c
rename to src/tests/clutter/conform/script-parser.c
diff --git a/clutter/tests/conform/scripts/test-animator-1.json b/src/tests/clutter/conform/scripts/test-animator-1.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-animator-1.json
rename to src/tests/clutter/conform/scripts/test-animator-1.json
diff --git a/clutter/tests/conform/scripts/test-animator-2.json b/src/tests/clutter/conform/scripts/test-animator-2.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-animator-2.json
rename to src/tests/clutter/conform/scripts/test-animator-2.json
diff --git a/clutter/tests/conform/scripts/test-animator-3.json b/src/tests/clutter/conform/scripts/test-animator-3.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-animator-3.json
rename to src/tests/clutter/conform/scripts/test-animator-3.json
diff --git a/clutter/tests/conform/scripts/test-script-animation.json b/src/tests/clutter/conform/scripts/test-script-animation.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-animation.json
rename to src/tests/clutter/conform/scripts/test-script-animation.json
diff --git a/clutter/tests/conform/scripts/test-script-child.json b/src/tests/clutter/conform/scripts/test-script-child.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-child.json
rename to src/tests/clutter/conform/scripts/test-script-child.json
diff --git a/clutter/tests/conform/scripts/test-script-implicit-alpha.json b/src/tests/clutter/conform/scripts/test-script-implicit-alpha.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-implicit-alpha.json
rename to src/tests/clutter/conform/scripts/test-script-implicit-alpha.json
diff --git a/clutter/tests/conform/scripts/test-script-interval.json b/src/tests/clutter/conform/scripts/test-script-interval.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-interval.json
rename to src/tests/clutter/conform/scripts/test-script-interval.json
diff --git a/clutter/tests/conform/scripts/test-script-layout-property.json b/src/tests/clutter/conform/scripts/test-script-layout-property.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-layout-property.json
rename to src/tests/clutter/conform/scripts/test-script-layout-property.json
diff --git a/clutter/tests/conform/scripts/test-script-margin.json b/src/tests/clutter/conform/scripts/test-script-margin.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-margin.json
rename to src/tests/clutter/conform/scripts/test-script-margin.json
diff --git a/clutter/tests/conform/scripts/test-script-model.json b/src/tests/clutter/conform/scripts/test-script-model.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-model.json
rename to src/tests/clutter/conform/scripts/test-script-model.json
diff --git a/clutter/tests/conform/scripts/test-script-named-object.json b/src/tests/clutter/conform/scripts/test-script-named-object.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-named-object.json
rename to src/tests/clutter/conform/scripts/test-script-named-object.json
diff --git a/clutter/tests/conform/scripts/test-script-object-property.json b/src/tests/clutter/conform/scripts/test-script-object-property.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-object-property.json
rename to src/tests/clutter/conform/scripts/test-script-object-property.json
diff --git a/clutter/tests/conform/scripts/test-script-single.json b/src/tests/clutter/conform/scripts/test-script-single.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-single.json
rename to src/tests/clutter/conform/scripts/test-script-single.json
diff --git a/clutter/tests/conform/scripts/test-script-timeline-markers.json b/src/tests/clutter/conform/scripts/test-script-timeline-markers.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-script-timeline-markers.json
rename to src/tests/clutter/conform/scripts/test-script-timeline-markers.json
diff --git a/clutter/tests/conform/scripts/test-state-1.json b/src/tests/clutter/conform/scripts/test-state-1.json
similarity index 100%
rename from clutter/tests/conform/scripts/test-state-1.json
rename to src/tests/clutter/conform/scripts/test-state-1.json
diff --git a/clutter/tests/conform/state.c b/src/tests/clutter/conform/state.c
similarity index 100%
rename from clutter/tests/conform/state.c
rename to src/tests/clutter/conform/state.c
diff --git a/clutter/tests/conform/text-cache.c b/src/tests/clutter/conform/text-cache.c
similarity index 100%
rename from clutter/tests/conform/text-cache.c
rename to src/tests/clutter/conform/text-cache.c
diff --git a/clutter/tests/conform/text.c b/src/tests/clutter/conform/text.c
similarity index 100%
rename from clutter/tests/conform/text.c
rename to src/tests/clutter/conform/text.c
diff --git a/clutter/tests/conform/texture-fbo.c b/src/tests/clutter/conform/texture-fbo.c
similarity index 100%
rename from clutter/tests/conform/texture-fbo.c
rename to src/tests/clutter/conform/texture-fbo.c
diff --git a/clutter/tests/conform/texture.c b/src/tests/clutter/conform/texture.c
similarity index 100%
rename from clutter/tests/conform/texture.c
rename to src/tests/clutter/conform/texture.c
diff --git a/clutter/tests/conform/timeline-interpolate.c b/src/tests/clutter/conform/timeline-interpolate.c
similarity index 100%
rename from clutter/tests/conform/timeline-interpolate.c
rename to src/tests/clutter/conform/timeline-interpolate.c
diff --git a/clutter/tests/conform/timeline-progress.c b/src/tests/clutter/conform/timeline-progress.c
similarity index 100%
rename from clutter/tests/conform/timeline-progress.c
rename to src/tests/clutter/conform/timeline-progress.c
diff --git a/clutter/tests/conform/timeline-rewind.c b/src/tests/clutter/conform/timeline-rewind.c
similarity index 100%
rename from clutter/tests/conform/timeline-rewind.c
rename to src/tests/clutter/conform/timeline-rewind.c
diff --git a/clutter/tests/conform/timeline.c b/src/tests/clutter/conform/timeline.c
similarity index 100%
rename from clutter/tests/conform/timeline.c
rename to src/tests/clutter/conform/timeline.c
diff --git a/clutter/tests/conform/units.c b/src/tests/clutter/conform/units.c
similarity index 100%
rename from clutter/tests/conform/units.c
rename to src/tests/clutter/conform/units.c
diff --git a/clutter/tests/interactive/.gitignore b/src/tests/clutter/interactive/.gitignore
similarity index 100%
rename from clutter/tests/interactive/.gitignore
rename to src/tests/clutter/interactive/.gitignore
diff --git a/clutter/tests/interactive/meson.build b/src/tests/clutter/interactive/meson.build
similarity index 100%
rename from clutter/tests/interactive/meson.build
rename to src/tests/clutter/interactive/meson.build
diff --git a/clutter/tests/interactive/meson/gen-test-unit-names.sh b/src/tests/clutter/interactive/meson/gen-test-unit-names.sh
similarity index 100%
rename from clutter/tests/interactive/meson/gen-test-unit-names.sh
rename to src/tests/clutter/interactive/meson/gen-test-unit-names.sh
diff --git a/clutter/tests/interactive/redhand.png b/src/tests/clutter/interactive/redhand.png
similarity index 100%
rename from clutter/tests/interactive/redhand.png
rename to src/tests/clutter/interactive/redhand.png
diff --git a/clutter/tests/interactive/test-actors.c b/src/tests/clutter/interactive/test-actors.c
similarity index 100%
rename from clutter/tests/interactive/test-actors.c
rename to src/tests/clutter/interactive/test-actors.c
diff --git a/clutter/tests/interactive/test-animation.c b/src/tests/clutter/interactive/test-animation.c
similarity index 100%
rename from clutter/tests/interactive/test-animation.c
rename to src/tests/clutter/interactive/test-animation.c
diff --git a/clutter/tests/interactive/test-bind-constraint.c b/src/tests/clutter/interactive/test-bind-constraint.c
similarity index 100%
rename from clutter/tests/interactive/test-bind-constraint.c
rename to src/tests/clutter/interactive/test-bind-constraint.c
diff --git a/clutter/tests/interactive/test-binding-pool.c b/src/tests/clutter/interactive/test-binding-pool.c
similarity index 100%
rename from clutter/tests/interactive/test-binding-pool.c
rename to src/tests/clutter/interactive/test-binding-pool.c
diff --git a/clutter/tests/interactive/test-cairo-clock.c b/src/tests/clutter/interactive/test-cairo-clock.c
similarity index 100%
rename from clutter/tests/interactive/test-cairo-clock.c
rename to src/tests/clutter/interactive/test-cairo-clock.c
diff --git a/clutter/tests/interactive/test-cairo-flowers.c b/src/tests/clutter/interactive/test-cairo-flowers.c
similarity index 100%
rename from clutter/tests/interactive/test-cairo-flowers.c
rename to src/tests/clutter/interactive/test-cairo-flowers.c
diff --git a/clutter/tests/interactive/test-cogl-multitexture.c b/src/tests/clutter/interactive/test-cogl-multitexture.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-multitexture.c
rename to src/tests/clutter/interactive/test-cogl-multitexture.c
diff --git a/clutter/tests/interactive/test-cogl-offscreen.c b/src/tests/clutter/interactive/test-cogl-offscreen.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-offscreen.c
rename to src/tests/clutter/interactive/test-cogl-offscreen.c
diff --git a/clutter/tests/interactive/test-cogl-point-sprites.c b/src/tests/clutter/interactive/test-cogl-point-sprites.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-point-sprites.c
rename to src/tests/clutter/interactive/test-cogl-point-sprites.c
diff --git a/clutter/tests/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-shader-glsl.c
rename to src/tests/clutter/interactive/test-cogl-shader-glsl.c
diff --git a/clutter/tests/interactive/test-cogl-tex-convert.c b/src/tests/clutter/interactive/test-cogl-tex-convert.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-tex-convert.c
rename to src/tests/clutter/interactive/test-cogl-tex-convert.c
diff --git a/clutter/tests/interactive/test-cogl-tex-polygon.c b/src/tests/clutter/interactive/test-cogl-tex-polygon.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-tex-polygon.c
rename to src/tests/clutter/interactive/test-cogl-tex-polygon.c
diff --git a/clutter/tests/interactive/test-cogl-tex-tile.c b/src/tests/clutter/interactive/test-cogl-tex-tile.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-tex-tile.c
rename to src/tests/clutter/interactive/test-cogl-tex-tile.c
diff --git a/clutter/tests/interactive/test-cogl-vertex-buffer.c b/src/tests/clutter/interactive/test-cogl-vertex-buffer.c
similarity index 100%
rename from clutter/tests/interactive/test-cogl-vertex-buffer.c
rename to src/tests/clutter/interactive/test-cogl-vertex-buffer.c
diff --git a/clutter/tests/interactive/test-content.c b/src/tests/clutter/interactive/test-content.c
similarity index 100%
rename from clutter/tests/interactive/test-content.c
rename to src/tests/clutter/interactive/test-content.c
diff --git a/clutter/tests/interactive/test-devices.c b/src/tests/clutter/interactive/test-devices.c
similarity index 100%
rename from clutter/tests/interactive/test-devices.c
rename to src/tests/clutter/interactive/test-devices.c
diff --git a/clutter/tests/interactive/test-easing.c b/src/tests/clutter/interactive/test-easing.c
similarity index 100%
rename from clutter/tests/interactive/test-easing.c
rename to src/tests/clutter/interactive/test-easing.c
diff --git a/clutter/tests/interactive/test-events.c b/src/tests/clutter/interactive/test-events.c
similarity index 100%
rename from clutter/tests/interactive/test-events.c
rename to src/tests/clutter/interactive/test-events.c
diff --git a/clutter/tests/interactive/test-fbo.c b/src/tests/clutter/interactive/test-fbo.c
similarity index 100%
rename from clutter/tests/interactive/test-fbo.c
rename to src/tests/clutter/interactive/test-fbo.c
diff --git a/clutter/tests/interactive/test-grab.c b/src/tests/clutter/interactive/test-grab.c
similarity index 100%
rename from clutter/tests/interactive/test-grab.c
rename to src/tests/clutter/interactive/test-grab.c
diff --git a/clutter/tests/interactive/test-image.c b/src/tests/clutter/interactive/test-image.c
similarity index 100%
rename from clutter/tests/interactive/test-image.c
rename to src/tests/clutter/interactive/test-image.c
diff --git a/clutter/tests/interactive/test-keyframe-transition.c b/src/tests/clutter/interactive/test-keyframe-transition.c
similarity index 100%
rename from clutter/tests/interactive/test-keyframe-transition.c
rename to src/tests/clutter/interactive/test-keyframe-transition.c
diff --git a/clutter/tests/interactive/test-layout.c b/src/tests/clutter/interactive/test-layout.c
similarity index 100%
rename from clutter/tests/interactive/test-layout.c
rename to src/tests/clutter/interactive/test-layout.c
diff --git a/clutter/tests/interactive/test-main.c b/src/tests/clutter/interactive/test-main.c
similarity index 100%
rename from clutter/tests/interactive/test-main.c
rename to src/tests/clutter/interactive/test-main.c
diff --git a/clutter/tests/interactive/test-paint-wrapper.c b/src/tests/clutter/interactive/test-paint-wrapper.c
similarity index 100%
rename from clutter/tests/interactive/test-paint-wrapper.c
rename to src/tests/clutter/interactive/test-paint-wrapper.c
diff --git a/clutter/tests/interactive/test-path-constraint.c b/src/tests/clutter/interactive/test-path-constraint.c
similarity index 100%
rename from clutter/tests/interactive/test-path-constraint.c
rename to src/tests/clutter/interactive/test-path-constraint.c
diff --git a/clutter/tests/interactive/test-rotate-zoom.c b/src/tests/clutter/interactive/test-rotate-zoom.c
similarity index 100%
rename from clutter/tests/interactive/test-rotate-zoom.c
rename to src/tests/clutter/interactive/test-rotate-zoom.c
diff --git a/clutter/tests/interactive/test-scale.c b/src/tests/clutter/interactive/test-scale.c
similarity index 100%
rename from clutter/tests/interactive/test-scale.c
rename to src/tests/clutter/interactive/test-scale.c
diff --git a/clutter/tests/interactive/test-script-signals.json b/src/tests/clutter/interactive/test-script-signals.json
similarity index 100%
rename from clutter/tests/interactive/test-script-signals.json
rename to src/tests/clutter/interactive/test-script-signals.json
diff --git a/clutter/tests/interactive/test-script.c b/src/tests/clutter/interactive/test-script.c
similarity index 100%
rename from clutter/tests/interactive/test-script.c
rename to src/tests/clutter/interactive/test-script.c
diff --git a/clutter/tests/interactive/test-script.json b/src/tests/clutter/interactive/test-script.json
similarity index 100%
rename from clutter/tests/interactive/test-script.json
rename to src/tests/clutter/interactive/test-script.json
diff --git a/clutter/tests/interactive/test-scrolling.c b/src/tests/clutter/interactive/test-scrolling.c
similarity index 100%
rename from clutter/tests/interactive/test-scrolling.c
rename to src/tests/clutter/interactive/test-scrolling.c
diff --git a/clutter/tests/interactive/test-shader-effects.c b/src/tests/clutter/interactive/test-shader-effects.c
similarity index 100%
rename from clutter/tests/interactive/test-shader-effects.c
rename to src/tests/clutter/interactive/test-shader-effects.c
diff --git a/clutter/tests/interactive/test-stage-read-pixels.c b/src/tests/clutter/interactive/test-stage-read-pixels.c
similarity index 100%
rename from clutter/tests/interactive/test-stage-read-pixels.c
rename to src/tests/clutter/interactive/test-stage-read-pixels.c
diff --git a/clutter/tests/interactive/test-stage-sizing.c b/src/tests/clutter/interactive/test-stage-sizing.c
similarity index 100%
rename from clutter/tests/interactive/test-stage-sizing.c
rename to src/tests/clutter/interactive/test-stage-sizing.c
diff --git a/clutter/tests/interactive/test-state-script.c b/src/tests/clutter/interactive/test-state-script.c
similarity index 100%
rename from clutter/tests/interactive/test-state-script.c
rename to src/tests/clutter/interactive/test-state-script.c
diff --git a/clutter/tests/interactive/test-state.c b/src/tests/clutter/interactive/test-state.c
similarity index 100%
rename from clutter/tests/interactive/test-state.c
rename to src/tests/clutter/interactive/test-state.c
diff --git a/clutter/tests/interactive/test-swipe-action.c b/src/tests/clutter/interactive/test-swipe-action.c
similarity index 100%
rename from clutter/tests/interactive/test-swipe-action.c
rename to src/tests/clutter/interactive/test-swipe-action.c
diff --git a/clutter/tests/interactive/test-table-layout.c b/src/tests/clutter/interactive/test-table-layout.c
similarity index 100%
rename from clutter/tests/interactive/test-table-layout.c
rename to src/tests/clutter/interactive/test-table-layout.c
diff --git a/clutter/tests/interactive/test-text-field.c b/src/tests/clutter/interactive/test-text-field.c
similarity index 100%
rename from clutter/tests/interactive/test-text-field.c
rename to src/tests/clutter/interactive/test-text-field.c
diff --git a/clutter/tests/interactive/test-text.c b/src/tests/clutter/interactive/test-text.c
similarity index 100%
rename from clutter/tests/interactive/test-text.c
rename to src/tests/clutter/interactive/test-text.c
diff --git a/clutter/tests/interactive/test-texture-async.c b/src/tests/clutter/interactive/test-texture-async.c
similarity index 100%
rename from clutter/tests/interactive/test-texture-async.c
rename to src/tests/clutter/interactive/test-texture-async.c
diff --git a/clutter/tests/interactive/test-texture-material.c b/src/tests/clutter/interactive/test-texture-material.c
similarity index 100%
rename from clutter/tests/interactive/test-texture-material.c
rename to src/tests/clutter/interactive/test-texture-material.c
diff --git a/clutter/tests/interactive/test-texture-quality.c b/src/tests/clutter/interactive/test-texture-quality.c
similarity index 100%
rename from clutter/tests/interactive/test-texture-quality.c
rename to src/tests/clutter/interactive/test-texture-quality.c
diff --git a/clutter/tests/interactive/test-texture-slicing.c b/src/tests/clutter/interactive/test-texture-slicing.c
similarity index 100%
rename from clutter/tests/interactive/test-texture-slicing.c
rename to src/tests/clutter/interactive/test-texture-slicing.c
diff --git a/clutter/tests/interactive/test-touch-events.c b/src/tests/clutter/interactive/test-touch-events.c
similarity index 100%
rename from clutter/tests/interactive/test-touch-events.c
rename to src/tests/clutter/interactive/test-touch-events.c
diff --git a/clutter/tests/interactive/wrapper.sh.in b/src/tests/clutter/interactive/wrapper.sh.in
similarity index 100%
rename from clutter/tests/interactive/wrapper.sh.in
rename to src/tests/clutter/interactive/wrapper.sh.in
diff --git a/clutter/tests/meson.build b/src/tests/clutter/meson.build
similarity index 100%
rename from clutter/tests/meson.build
rename to src/tests/clutter/meson.build
diff --git a/clutter/tests/micro-bench/.gitignore b/src/tests/clutter/micro-bench/.gitignore
similarity index 100%
rename from clutter/tests/micro-bench/.gitignore
rename to src/tests/clutter/micro-bench/.gitignore
diff --git a/clutter/tests/micro-bench/meson.build b/src/tests/clutter/micro-bench/meson.build
similarity index 100%
rename from clutter/tests/micro-bench/meson.build
rename to src/tests/clutter/micro-bench/meson.build
diff --git a/clutter/tests/micro-bench/test-cogl-perf.c b/src/tests/clutter/micro-bench/test-cogl-perf.c
similarity index 100%
rename from clutter/tests/micro-bench/test-cogl-perf.c
rename to src/tests/clutter/micro-bench/test-cogl-perf.c
diff --git a/clutter/tests/micro-bench/test-picking.c b/src/tests/clutter/micro-bench/test-picking.c
similarity index 100%
rename from clutter/tests/micro-bench/test-picking.c
rename to src/tests/clutter/micro-bench/test-picking.c
diff --git a/clutter/tests/micro-bench/test-random-text.c b/src/tests/clutter/micro-bench/test-random-text.c
similarity index 100%
rename from clutter/tests/micro-bench/test-random-text.c
rename to src/tests/clutter/micro-bench/test-random-text.c
diff --git a/clutter/tests/micro-bench/test-text-perf.c b/src/tests/clutter/micro-bench/test-text-perf.c
similarity index 100%
rename from clutter/tests/micro-bench/test-text-perf.c
rename to src/tests/clutter/micro-bench/test-text-perf.c
diff --git a/clutter/tests/micro-bench/test-text.c b/src/tests/clutter/micro-bench/test-text.c
similarity index 100%
rename from clutter/tests/micro-bench/test-text.c
rename to src/tests/clutter/micro-bench/test-text.c
diff --git a/clutter/tests/performance/.gitignore b/src/tests/clutter/performance/.gitignore
similarity index 100%
rename from clutter/tests/performance/.gitignore
rename to src/tests/clutter/performance/.gitignore
diff --git a/clutter/tests/performance/create-report.rb b/src/tests/clutter/performance/create-report.rb
similarity index 100%
rename from clutter/tests/performance/create-report.rb
rename to src/tests/clutter/performance/create-report.rb
diff --git a/clutter/tests/performance/joblist b/src/tests/clutter/performance/joblist
similarity index 100%
rename from clutter/tests/performance/joblist
rename to src/tests/clutter/performance/joblist
diff --git a/clutter/tests/performance/makejobs.rb b/src/tests/clutter/performance/makejobs.rb
similarity index 100%
rename from clutter/tests/performance/makejobs.rb
rename to src/tests/clutter/performance/makejobs.rb
diff --git a/clutter/tests/performance/meson.build b/src/tests/clutter/performance/meson.build
similarity index 100%
rename from clutter/tests/performance/meson.build
rename to src/tests/clutter/performance/meson.build
diff --git a/clutter/tests/performance/test-common.h b/src/tests/clutter/performance/test-common.h
similarity index 100%
rename from clutter/tests/performance/test-common.h
rename to src/tests/clutter/performance/test-common.h
diff --git a/clutter/tests/performance/test-picking.c b/src/tests/clutter/performance/test-picking.c
similarity index 100%
rename from clutter/tests/performance/test-picking.c
rename to src/tests/clutter/performance/test-picking.c
diff --git a/clutter/tests/performance/test-state-hidden.c b/src/tests/clutter/performance/test-state-hidden.c
similarity index 100%
rename from clutter/tests/performance/test-state-hidden.c
rename to src/tests/clutter/performance/test-state-hidden.c
diff --git a/clutter/tests/performance/test-state-interactive.c b/src/tests/clutter/performance/test-state-interactive.c
similarity index 100%
rename from clutter/tests/performance/test-state-interactive.c
rename to src/tests/clutter/performance/test-state-interactive.c
diff --git a/clutter/tests/performance/test-state-mini.c b/src/tests/clutter/performance/test-state-mini.c
similarity index 100%
rename from clutter/tests/performance/test-state-mini.c
rename to src/tests/clutter/performance/test-state-mini.c
diff --git a/clutter/tests/performance/test-state-pick.c b/src/tests/clutter/performance/test-state-pick.c
similarity index 100%
rename from clutter/tests/performance/test-state-pick.c
rename to src/tests/clutter/performance/test-state-pick.c
diff --git a/clutter/tests/performance/test-state.c b/src/tests/clutter/performance/test-state.c
similarity index 100%
rename from clutter/tests/performance/test-state.c
rename to src/tests/clutter/performance/test-state.c
diff --git a/clutter/tests/performance/test-text-perf.c b/src/tests/clutter/performance/test-text-perf.c
similarity index 100%
rename from clutter/tests/performance/test-text-perf.c
rename to src/tests/clutter/performance/test-text-perf.c
diff --git a/src/tests/meson.build b/src/tests/meson.build
index eadef4173..51039d04f 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,3 +1,7 @@
+#if have_clutter_tests
+#  subdir('clutter')
+#endif
+
 tests_includepath = mutter_includes
 tests_c_args = mutter_c_args