diff --git a/Makefile.am b/Makefile.am
index ab18b15..03779e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libcpuid cpuid_tool
+SUBDIRS = libcpuid cpuid_tool tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 
diff --git a/configure.ac b/configure.ac
index ea0e5e8..75cd6d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ AC_CONFIG_FILES([
   libcpuid.pc
   libcpuid/Makefile
   cpuid_tool/Makefile
+  tests/Makefile
 ])
 AC_OUTPUT
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..163910d
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = run_tests.py tests_stash.txt