diff --git a/tests/counting/.fixture/faila b/tests/counting/.test/faila
similarity index 100%
rename from tests/counting/.fixture/faila
rename to tests/counting/.test/faila
diff --git a/tests/counting/.fixture/failb b/tests/counting/.test/failb
similarity index 100%
rename from tests/counting/.fixture/failb
rename to tests/counting/.test/failb
diff --git a/tests/counting/.fixture/failc b/tests/counting/.test/failc
similarity index 100%
rename from tests/counting/.fixture/failc
rename to tests/counting/.test/failc
diff --git a/tests/counting/.fixture/passa b/tests/counting/.test/passa
similarity index 100%
rename from tests/counting/.fixture/passa
rename to tests/counting/.test/passa
diff --git a/tests/counting/.fixture/passb b/tests/counting/.test/passb
similarity index 100%
rename from tests/counting/.fixture/passb
rename to tests/counting/.test/passb
diff --git a/tests/counting/.fixture/passc b/tests/counting/.test/passc
similarity index 100%
rename from tests/counting/.fixture/passc
rename to tests/counting/.test/passc
diff --git a/tests/counting/.fixture/passd b/tests/counting/.test/passd
similarity index 100%
rename from tests/counting/.fixture/passd
rename to tests/counting/.test/passd
diff --git a/tests/counting/.fixture/passe b/tests/counting/.test/passe
similarity index 100%
rename from tests/counting/.fixture/passe
rename to tests/counting/.test/passe
diff --git a/tests/counting/.fixture/passf b/tests/counting/.test/passf
similarity index 100%
rename from tests/counting/.fixture/passf
rename to tests/counting/.test/passf
diff --git a/tests/counting/.fixture/passg b/tests/counting/.test/passg
similarity index 100%
rename from tests/counting/.fixture/passg
rename to tests/counting/.test/passg
diff --git a/tests/counting/seven_successes b/tests/counting/seven_successes
index 450af11..1a55335 100755
--- a/tests/counting/seven_successes
+++ b/tests/counting/seven_successes
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../../urchin .fixture | grep '7 tests passed.'
+../../urchin .test | grep '7 tests passed.'
diff --git a/tests/counting/three_failures b/tests/counting/three_failures
index 9db4dfd..2ee1c96 100755
--- a/tests/counting/three_failures
+++ b/tests/counting/three_failures
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../../urchin .fixture | grep '3 tests failed.'
+../../urchin .test | grep '3 tests failed.'
diff --git a/tests/setup_teardown/.fixtures/setup b/tests/setup_teardown/.test/setup
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup
rename to tests/setup_teardown/.test/setup
diff --git a/tests/setup_teardown/.fixtures/setup has run twice a b/tests/setup_teardown/.test/setup has run twice a
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup has run twice a
rename to tests/setup_teardown/.test/setup has run twice a
diff --git a/tests/setup_teardown/.fixtures/setup has run twice b b/tests/setup_teardown/.test/setup has run twice b
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup has run twice b
rename to tests/setup_teardown/.test/setup has run twice b
diff --git a/tests/setup_teardown/.fixtures/setup_dir b/tests/setup_teardown/.test/setup_dir
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup_dir
rename to tests/setup_teardown/.test/setup_dir
diff --git a/tests/setup_teardown/.fixtures/setup_dir runs b/tests/setup_teardown/.test/setup_dir runs
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup_dir runs
rename to tests/setup_teardown/.test/setup_dir runs
diff --git a/tests/setup_teardown/.fixtures/setup_dir runs only oncea b/tests/setup_teardown/.test/setup_dir runs only oncea
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup_dir runs only oncea
rename to tests/setup_teardown/.test/setup_dir runs only oncea
diff --git a/tests/setup_teardown/.fixtures/setup_dir runs only onceb b/tests/setup_teardown/.test/setup_dir runs only onceb
similarity index 100%
rename from tests/setup_teardown/.fixtures/setup_dir runs only onceb
rename to tests/setup_teardown/.test/setup_dir runs only onceb
diff --git a/tests/setup_teardown/.fixtures/teardown b/tests/setup_teardown/.test/teardown
similarity index 100%
rename from tests/setup_teardown/.fixtures/teardown
rename to tests/setup_teardown/.test/teardown
diff --git a/tests/setup_teardown/.fixtures/teardown has run twice a b/tests/setup_teardown/.test/teardown has run twice a
similarity index 100%
rename from tests/setup_teardown/.fixtures/teardown has run twice a
rename to tests/setup_teardown/.test/teardown has run twice a
diff --git a/tests/setup_teardown/.fixtures/teardown has run twice b b/tests/setup_teardown/.test/teardown has run twice b
similarity index 100%
rename from tests/setup_teardown/.fixtures/teardown has run twice b
rename to tests/setup_teardown/.test/teardown has run twice b
diff --git a/tests/setup_teardown/.fixtures/teardown_dir b/tests/setup_teardown/.test/teardown_dir
similarity index 100%
rename from tests/setup_teardown/.fixtures/teardown_dir
rename to tests/setup_teardown/.test/teardown_dir
diff --git a/tests/setup_teardown/count runs b/tests/setup_teardown/count runs
index a30f8b2..8dd2095 100755
--- a/tests/setup_teardown/count runs	
+++ b/tests/setup_teardown/count runs	
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ $(../../urchin .fixtures| grep 31|wc -l) -lt 3 ]
+[ $(../../urchin .test| grep 31|wc -l) -lt 3 ]