diff --git a/Makefile.am b/Makefile.am
index 2e3d3ae..0b824b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@
 	utility.cpp \
 	timer.cpp
 
-SUBDIRS = . test sdevent/test
+SUBDIRS = . test sdevent/test evdevpp/test
 
 if WANT_PRESENCE
 SUBDIRS += presence
diff --git a/configure.ac b/configure.ac
index b7842fd..11d557e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,5 +161,5 @@
 ])
 
 # Create configured output
-AC_CONFIG_FILES([Makefile test/Makefile sdevent/test/Makefile])
+AC_CONFIG_FILES([Makefile test/Makefile sdevent/test/Makefile evdevpp/test/Makefile])
 AC_OUTPUT
diff --git a/evdevpp/test/.gitignore b/evdevpp/test/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/evdevpp/test/.gitignore
diff --git a/evdevpp/test/Makefile.am b/evdevpp/test/Makefile.am
new file mode 100644
index 0000000..36455d7
--- /dev/null
+++ b/evdevpp/test/Makefile.am
@@ -0,0 +1,8 @@
+AM_CPPFLAGS = -iquote$(top_srcdir)
+gtest_cflags = $(PTHREAD_CFLAGS)
+gtest_ldadd = -lgtest -lgtest_main -lgmock $(PTHREAD_LIBS)
+
+check_PROGRAMS =
+noinst_PROGRAMS =
+
+TESTS = $(check_PROGRAMS)