diff --git a/Makefile.am b/Makefile.am
index a8a5147..be67de0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = kernel caca src examples tools caca-sharp cxx python ruby doc tests
+SUBDIRS = kernel caca src examples tools caca-sharp cxx python ruby doc test
 DIST_SUBDIRS = $(SUBDIRS) win32
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec libcaca.sln
diff --git a/configure.ac b/configure.ac
index 620a6f1..f7e124f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,7 +504,7 @@ AC_CONFIG_FILES([
   caca/Makefile
   src/Makefile
   examples/Makefile
-  tests/Makefile
+  test/Makefile
   tools/Makefile
   caca-sharp/Makefile
   cxx/Makefile
diff --git a/tests/.gitignore b/test/.gitignore
similarity index 100%
rename from tests/.gitignore
rename to test/.gitignore
diff --git a/tests/Makefile.am b/test/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to test/Makefile.am
diff --git a/tests/bench.c b/test/bench.c
similarity index 100%
rename from tests/bench.c
rename to test/bench.c
diff --git a/tests/bench.vcproj b/test/bench.vcproj
similarity index 100%
rename from tests/bench.vcproj
rename to test/bench.vcproj
diff --git a/tests/caca-test.cpp b/test/caca-test.cpp
similarity index 100%
rename from tests/caca-test.cpp
rename to test/caca-test.cpp
diff --git a/tests/canvas.cpp b/test/canvas.cpp
similarity index 100%
rename from tests/canvas.cpp
rename to test/canvas.cpp
diff --git a/tests/check-build b/test/check-build
similarity index 100%
rename from tests/check-build
rename to test/check-build
diff --git a/tests/dirty.cpp b/test/dirty.cpp
similarity index 100%
rename from tests/dirty.cpp
rename to test/dirty.cpp
diff --git a/tests/driver.cpp b/test/driver.cpp
similarity index 100%
rename from tests/driver.cpp
rename to test/driver.cpp
diff --git a/tests/export.cpp b/test/export.cpp
similarity index 100%
rename from tests/export.cpp
rename to test/export.cpp
diff --git a/tests/simple.c b/test/simple.c
similarity index 100%
rename from tests/simple.c
rename to test/simple.c