diff --git a/Makefile.am b/Makefile.am
index f8dc1d0..360bd68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ else
 pkgconfig_DATA=pc/hidapi.pc
 endif
 
-
 SUBDIRS=
 
 if OS_LINUX
@@ -32,6 +31,8 @@ if OS_WINDOWS
 SUBDIRS += windows
 endif
 
+SUBDIRS += hidtest
+
 if BUILD_TESTGUI
 SUBDIRS += testgui
 endif
diff --git a/configure.ac b/configure.ac
index 3123a3b..5b54d03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,5 +145,5 @@ else
 	AC_CONFIG_FILES([pc/hidapi.pc])
 fi
 
-AC_CONFIG_FILES([Makefile linux/Makefile libusb/Makefile mac/Makefile windows/Makefile testgui/Makefile])
+AC_CONFIG_FILES([Makefile linux/Makefile libusb/Makefile mac/Makefile windows/Makefile hidtest/Makefile testgui/Makefile])
 AC_OUTPUT
diff --git a/hidtest/Makefile.am b/hidtest/Makefile.am
new file mode 100644
index 0000000..c8e9664
--- /dev/null
+++ b/hidtest/Makefile.am
@@ -0,0 +1,21 @@
+
+AM_CPPFLAGS = -I$(srcdir)/../hidapi/
+
+## Linux
+if OS_LINUX
+noinst_PROGRAMS = hidtest-libusb hidtest-hidraw
+
+hidtest_hidraw_SOURCES = hidtest.cpp
+hidtest_hidraw_LDADD = $(srcdir)/../linux/libhidapi-hidraw.la
+
+hidtest_libusb_SOURCES = hidtest.cpp
+hidtest_libusb_LDADD = $(srcdir)/../libusb/libhidapi-libusb.la
+else
+
+# Other OS's
+noinst_PROGRAMS = hidtest
+
+hidtest_SOURCES = test.cpp
+hidtest_LDADD = $(srcdir)/../windows/libhidapi.la
+
+endif