diff --git a/.gitignore b/.gitignore
index b1c182304..536d26f2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,9 @@ clutter.pc
 *.lo
 *.la
 *.gcov
-ChangeLog*
 stamp-enum-types
 stamp-marshal
+/ChangeLog*
 /clutter/clutter-enum-types.[ch]
 /clutter/clutter-marshal.[ch]
 /clutter/clutter-version.h
@@ -28,9 +28,9 @@ stamp-marshal
 /clutter/cogl/cogl/driver/gles/cogl-fixed-vertex-shader.[ch]
 /clutter/cogl/cogl/driver/gles/cogl-fixed-fragment-shader.[ch]
 /clutter/x11/clutter-x11-enum-types.[ch]
+/clutter/json/*.gir
 *.gir
 *.typelib
-/clutter/json/*.gir
 config.*
 configure
 depcomp
@@ -78,198 +78,6 @@ missing
 mkinstalldirs
 stamp-h1
 TAGS
-/tests/interactive/*.o
-/tests/conform/*.o
-/tests/micro-bench/*.o
-/tests/interactive/test-actor-clone
-/tests/interactive/test-actors
-/tests/interactive/test-behave
-/tests/interactive/test-boxes
-/tests/interactive/test-depth
-/tests/interactive/test-effects
-/tests/interactive/test-events
-/tests/interactive/test-fbo
-/tests/interactive/test-fullscreen
-/tests/interactive/test-grab
-/tests/interactive/test-model
-/tests/interactive/test-multistage
-/tests/interactive/test-offscreen
-/tests/interactive/test-opacity
-/tests/interactive/test-perspective
-/tests/interactive/test-project
-/tests/interactive/test-rotate
-/tests/interactive/test-scale
-/tests/interactive/test-score
-/tests/interactive/test-script
-/tests/interactive/test-shader
-/tests/interactive/test-text
-/tests/interactive/test-textures
-/tests/interactive/test-threads
-/tests/interactive/test-timeline
-/tests/interactive/test-timeline-dup-frames
-/tests/interactive/test-timeline-interpolate
-/tests/interactive/test-timeline-rewind
-/tests/interactive/test-timeline-smoothness
-/tests/interactive/test-unproject
-/tests/interactive/test-viewport
-/tests/interactive/test-cogl-multitexture
-/tests/interactive/test-cogl-offscreen
-/tests/interactive/test-cogl-primitives
-/tests/interactive/test-cogl-tex-convert
-/tests/interactive/test-cogl-tex-foreign
-/tests/interactive/test-cogl-tex-getset
-/tests/interactive/test-cogl-tex-polygon
-/tests/interactive/test-cogl-tex-tile
-/tests/interactive/test-cogl-vertex-buffer
-/tests/interactive/test-pixmap
-/tests/interactive/test-stage-read-pixels
-/tests/interactive/test-clip
-/tests/interactive/test-layout
-/tests/interactive/test-random-text
-/tests/interactive/test-texture-async
-/tests/interactive/test-texture-quality
-/tests/interactive/test-paint-wrapper
-/tests/interactive/test-devices
-/tests/interactive/test-label-cache
-/tests/interactive/test-pick
-/tests/interactive/test-animation
-/tests/interactive/test-easing
-/tests/interactive/test-interactive
-/tests/interactive/test-binding-pool
-/tests/interactive/test-text-field
-/tests/interactive/light0.png
-/tests/interactive/light1.png
-/tests/interactive/redhand.png
-/tests/interactive/redhand_alpha.png
-/tests/interactive/test-script.json
-/tests/interactive/test-clutter-cairo-flowers
-/tests/interactive/test-bin-layout
-/tests/interactive/test-flow-layout
-/tests/interactive/test-box-layout
-/tests/interactive/stamp-test-interactive
-/tests/interactive/test-animator
-/tests/interactive/test-stage-sizing
-/tests/interactive/test-drag
-/tests/interactive/test-constraints
-/tests/interactive/test-state
-/tests/interactive/test-state-animator
-/tests/interactive/test-scrolling
-/tests/conform/stamp-test-conformance
-/tests/conform/test-anchors
-/tests/conform/test-cogl-backface-culling
-/tests/conform/test-cogl-blend-strings
-/tests/conform/test-cogl-fixed
-/tests/conform/test-cogl-materials
-/tests/conform/test-cogl-npot-texture
-/tests/conform/test-cogl-offscreen
-/tests/conform/test-cogl-pixel-buffer
-/tests/conform/test-cogl-premult
-/tests/conform/test-color-hls-roundtrip
-/tests/conform/test-conformance
-/tests/conform/test-conformance-results.xml
-/tests/conform/test-conformance-results.html
-/tests/conform/test-conformance-results-dn.xml
-/tests/conform/test-conformance-results-dn.html
-/tests/conform/test-entry-append-some
-/tests/conform/test-entry-cursor
-/tests/conform/test-entry-delete-chars
-/tests/conform/test-entry-delete-text
-/tests/conform/test-entry-empty
-/tests/conform/test-entry-event
-/tests/conform/test-entry-insert
-/tests/conform/test-entry-prepend-some
-/tests/conform/test-entry-set-empty
-/tests/conform/test-entry-set-text
-/tests/conform/test-entry-utf8-validation
-/tests/conform/test-fixed-constants
-/tests/conform/test-initial-state
-/tests/conform/test-label-cache
-/tests/conform/test-mapped
-/tests/conform/test-path
-/tests/conform/test-pick
-/tests/conform/test-realized
-/tests/conform/test-rect-set-color
-/tests/conform/test-rect-set-size
-/tests/conform/test-show-on-set-parent
-/tests/conform/test-timeline
-/tests/conform/test-timeline-dup-frames
-/tests/conform/test-timeline-interpolate
-/tests/conform/test-timeline-rewind
-/tests/conform/test-timeline-smoothness
-/tests/conform/test-label-opacity
-/tests/conform/test-mesh-contiguous
-/tests/conform/test-mesh-interleved
-/tests/conform/test-mesh-mutability
-/tests/conform/test-paint-opacity
-/tests/conform/test-rectangle-opacity
-/tests/conform/test-binding-pool
-/tests/conform/test-text-append-some
-/tests/conform/test-text-cache
-/tests/conform/test-text-cursor
-/tests/conform/test-text-delete-chars
-/tests/conform/test-text-delete-text
-/tests/conform/test-text-empty
-/tests/conform/test-text-event
-/tests/conform/test-text-get-chars
-/tests/conform/test-text-insert
-/tests/conform/test-text-password-char
-/tests/conform/test-text-prepend-some
-/tests/conform/test-text-set-empty
-/tests/conform/test-text-set-text
-/tests/conform/test-text-utf8-validation
-/tests/conform/test-list-model-iterate
-/tests/conform/test-list-model-populate
-/tests/conform/test-list-model-filter
-/tests/conform/redhand.png
-/tests/conform/test-map-recursive
-/tests/conform/test-realize-not-recursive
-/tests/conform/test-shown-not-parented
-/tests/conform/test-color-from-string
-/tests/conform/test-color-to-string
-/tests/conform/test-cogl-vertex-buffer-contiguous
-/tests/conform/test-cogl-vertex-buffer-interleved
-/tests/conform/test-cogl-vertex-buffer-mutability
-/tests/conform/test-units-constructors
-/tests/conform/test-units-string
-/tests/conform/test-premult
-/tests/conform/test-clone-no-map
-/tests/conform/test-group-depth-sorting
-/tests/conform/test-conformance-result.xml
-/tests/conform/test-fixed-size
-/tests/conform/test-preferred-size
-/tests/conform/test-units-cache
-/tests/conform/test-cogl-readpixels
-/tests/conform/test-cogl-viewport
-/tests/conform/test-texture-fbo
-/tests/conform/test-script-single
-/tests/conform/test-script-child
-/tests/conform/test-list-model-from-script
-/tests/conform/test-script-implicit-alpha
-/tests/conform/test-script-object-property
-/tests/conform/test-script-animation
-/tests/conform/test-script-named-object
-/tests/conform/test-actor-destruction
-/tests/conform/test-color-operators
-/tests/conform/test-cogl-texture-mipmaps
-/tests/conform/test-behaviours
-/tests/conform/test-cogl-sub-texture
-/tests/conform/test-cogl-multitexture
-/tests/conform/test-animator-base
-/tests/conform/test-animator-properties
-/tests/conform/test-animator-multi-properties
-/tests/conform/test-cogl-texture-rectangle
-/tests/conform/test-cogl-path
-/tests/conform/test-cogl-wrap-modes
-/tests/conform/test-clutter-cairo-texture
-/tests/conform/test-state-base
-/tests/conform/test-texture-pick-with-alpha
-/tests/conform/test-cogl-object
-/tests/conform/test-script-layout-property
-/tests/conform/test-cogl-depth-test
-/tests/conform/wrappers
-/tests/micro-bench/test-text-perf
-/tests/micro-bench/test-text
-/tests/micro-bench/test-picking
 /tests/tools/disable-npots.sh
 /po/Makefile.in.in
 /po/POTFILES
diff --git a/tests/conform/.gitignore b/tests/conform/.gitignore
new file mode 100644
index 000000000..6079dcef9
--- /dev/null
+++ b/tests/conform/.gitignore
@@ -0,0 +1,113 @@
+*.o
+/stamp-test-conformance
+/test-anchors
+/test-cogl-backface-culling
+/test-cogl-blend-strings
+/test-cogl-fixed
+/test-cogl-materials
+/test-cogl-npot-texture
+/test-cogl-offscreen
+/test-cogl-pixel-buffer
+/test-cogl-premult
+/test-color-hls-roundtrip
+/test-conformance
+/test-conformance-results.xml
+/test-conformance-results.html
+/test-conformance-results-dn.xml
+/test-conformance-results-dn.html
+/test-entry-append-some
+/test-entry-cursor
+/test-entry-delete-chars
+/test-entry-delete-text
+/test-entry-empty
+/test-entry-event
+/test-entry-insert
+/test-entry-prepend-some
+/test-entry-set-empty
+/test-entry-set-text
+/test-entry-utf8-validation
+/test-fixed-constants
+/test-initial-state
+/test-label-cache
+/test-mapped
+/test-path
+/test-pick
+/test-realized
+/test-rect-set-color
+/test-rect-set-size
+/test-show-on-set-parent
+/test-timeline
+/test-timeline-dup-frames
+/test-timeline-interpolate
+/test-timeline-rewind
+/test-timeline-smoothness
+/test-label-opacity
+/test-mesh-contiguous
+/test-mesh-interleved
+/test-mesh-mutability
+/test-paint-opacity
+/test-rectangle-opacity
+/test-binding-pool
+/test-text-append-some
+/test-text-cache
+/test-text-cursor
+/test-text-delete-chars
+/test-text-delete-text
+/test-text-empty
+/test-text-event
+/test-text-get-chars
+/test-text-insert
+/test-text-password-char
+/test-text-prepend-some
+/test-text-set-empty
+/test-text-set-text
+/test-text-utf8-validation
+/test-list-model-iterate
+/test-list-model-populate
+/test-list-model-filter
+/test-map-recursive
+/test-realize-not-recursive
+/test-shown-not-parented
+/test-color-from-string
+/test-color-to-string
+/test-cogl-vertex-buffer-contiguous
+/test-cogl-vertex-buffer-interleved
+/test-cogl-vertex-buffer-mutability
+/test-units-constructors
+/test-units-string
+/test-premult
+/test-clone-no-map
+/test-group-depth-sorting
+/test-conformance-result.xml
+/test-fixed-size
+/test-preferred-size
+/test-units-cache
+/test-cogl-readpixels
+/test-cogl-viewport
+/test-texture-fbo
+/test-script-single
+/test-script-child
+/test-list-model-from-script
+/test-script-implicit-alpha
+/test-script-object-property
+/test-script-animation
+/test-script-named-object
+/test-actor-destruction
+/test-color-operators
+/test-cogl-texture-mipmaps
+/test-behaviours
+/test-cogl-sub-texture
+/test-cogl-multitexture
+/test-animator-base
+/test-animator-properties
+/test-animator-multi-properties
+/test-cogl-texture-rectangle
+/test-cogl-path
+/test-cogl-wrap-modes
+/test-clutter-cairo-texture
+/test-state-base
+/test-texture-pick-with-alpha
+/test-cogl-object
+/test-script-layout-property
+/test-cogl-depth-test
+/wrappers
diff --git a/tests/interactive/.gitignore b/tests/interactive/.gitignore
new file mode 100644
index 000000000..3b0fd8a54
--- /dev/null
+++ b/tests/interactive/.gitignore
@@ -0,0 +1,69 @@
+*.o
+/stamp-test-interactive
+/test-actor-clone
+/test-actors
+/test-behave
+/test-boxes
+/test-depth
+/test-effects
+/test-events
+/test-fbo
+/test-fullscreen
+/test-grab
+/test-model
+/test-multistage
+/test-offscreen
+/test-opacity
+/test-perspective
+/test-project
+/test-rotate
+/test-scale
+/test-score
+/test-script
+/test-shader
+/test-text
+/test-textures
+/test-threads
+/test-timeline
+/test-timeline-dup-frames
+/test-timeline-interpolate
+/test-timeline-rewind
+/test-timeline-smoothness
+/test-unproject
+/test-viewport
+/test-cogl-multitexture
+/test-cogl-offscreen
+/test-cogl-primitives
+/test-cogl-tex-convert
+/test-cogl-tex-foreign
+/test-cogl-tex-getset
+/test-cogl-tex-polygon
+/test-cogl-tex-tile
+/test-cogl-vertex-buffer
+/test-pixmap
+/test-stage-read-pixels
+/test-clip
+/test-layout
+/test-random-text
+/test-texture-async
+/test-texture-quality
+/test-paint-wrapper
+/test-devices
+/test-label-cache
+/test-pick
+/test-animation
+/test-easing
+/test-interactive
+/test-binding-pool
+/test-text-field
+/test-clutter-cairo-flowers
+/test-bin-layout
+/test-flow-layout
+/test-box-layout
+/test-animator
+/test-stage-sizing
+/test-drag
+/test-constraints
+/test-state
+/test-state-animator
+/test-scrolling
diff --git a/tests/micro-bench/.gitignore b/tests/micro-bench/.gitignore
new file mode 100644
index 000000000..e02716c16
--- /dev/null
+++ b/tests/micro-bench/.gitignore
@@ -0,0 +1,4 @@
+*.o
+/test-text-perf
+/test-text
+/test-picking