diff --git a/.gitignore b/.gitignore
index 422e999..19ee82b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ ylwrap
 .vimdir
 *.tar.*
 *.3
+libevdev-events
diff --git a/Makefile.am b/Makefile.am
index 78958e6..c31861a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libevdev test man
+SUBDIRS = libevdev tools man
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libevdev.pc
diff --git a/configure.ac b/configure.ac
index 8e45ba2..bb58781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,6 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 AC_CONFIG_FILES([Makefile
 		 libevdev/Makefile
 		 man/Makefile
-		 test/Makefile
+		 tools/Makefile
 		 libevdev.pc])
 AC_OUTPUT
diff --git a/test/Makefile.am b/tools/Makefile.am
similarity index 100%
rename from test/Makefile.am
rename to tools/Makefile.am
diff --git a/test/event-names.h b/tools/event-names.h
similarity index 100%
rename from test/event-names.h
rename to tools/event-names.h
diff --git a/test/libevdev-events.c b/tools/libevdev-events.c
similarity index 100%
rename from test/libevdev-events.c
rename to tools/libevdev-events.c