diff --git a/Makefile.am b/Makefile.am
index d289b2e..57c0c82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = hal qahw_api
+SUBDIRS = hal qahw_api qahw_api/test
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index a2584ee..a1b601e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,8 @@
 AC_CONFIG_FILES([ \
         Makefile \
         hal/Makefile \
-        qahw_api/Makefile
+        qahw_api/Makefile \
+        qahw_api/test/Makefile
         ])
 
 AC_OUTPUT
diff --git a/qahw_api/test/Makefile.am b/qahw_api/test/Makefile.am
new file mode 100644
index 0000000..3da1435
--- /dev/null
+++ b/qahw_api/test/Makefile.am
@@ -0,0 +1,19 @@
+bin_PROGRAMS = hal_play_test
+
+PLAY_CPPFLAGS = -Wno-sign-compare
+PLAY_INCLUDES = -I $(top_srcdir)/qahw_api/inc
+
+hal_play_test_SOURCES = qahw_playback_test.c
+hal_play_test_CPPFLAGS = $(PLAY_CPPFLAGS) $(PLAY_INCLUDES)
+hal_play_test_LDADD = -lutils ../libqahw.la
+
+
+bin_PROGRAMS += hal_rec_test
+
+REC_CPPFLAGS = $(PLAY_CPPFLAGS) -Dnullptr=NULL
+REC_INCLUDES = $(PLAY_INCLUDES)
+
+hal_rec_test_SOURCES = qahw_multi_record_test.c
+hal_rec_test_CPPFLAGS = -Dstrlcat=g_strlcat $(GLIB_CFLAGS) -include glib.h
+hal_rec_test_CPPFLAGS += $(REC_CPPFLAGS) $(REC_INCLUDES)
+hal_rec_test_LDADD = -lutils ../libqahw.la $(GLIB_LIBS)