diff --git a/configure.ac b/configure.ac
index 543b479..f6001a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_PREREQ([2.71])
 # See if --prefix was set. If not, set it to a reasonable default
 # based on where bash thinks bashdb is supposed to be installed.
 ##################################################################
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign serial-tests])
 AM_MAINTAINER_MODE
 
 
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index d450c40..845ec54 100644
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -1,19 +1,48 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-COMBINED_TESTS = $(wildcard test-*.sh)
-tests_sources = $(notdir $(COMBINED_TESTS:=.in))
+
+# Don't forget to add the *.in files of new tests to configure.ac in the root folder
+TESTS = test-action.sh \
+        test-alias.sh \
+        test-bashdb-trace.sh \
+        test-break.sh \
+        test-cmd-complete.sh \
+        test-cmd-eval.sh \
+        test-cmd-info-variables.sh \
+        test-columns.sh \
+        test-filecache.sh \
+        test-file.sh \
+        test-fns.sh \
+        test-frame.sh \
+        test-get-sourceline.sh \
+        test-io.sh \
+        test-lib-eval.sh \
+        test-lib-list.sh \
+        test-logging.sh \
+        test-msg.sh \
+        test-pre.sh \
+        test-require.sh \
+        test-run.sh \
+        test-save-restore.sh \
+        test-sort.sh \
+        test-validate.sh
+
+tests_sources = $(notdir $(TESTS:=.in))
 
 abs_srcdir=@abs_srcdir@
 abs_builddir=@abs_builddir@
 
 TESTS_ENVIRONMENT = \
   srcdir="$(abs_srcdir)" \
-  builddir="$(abs_builddir)"
+  builddir="$(abs_builddir)" \
+  $(SH_PROG) $(abs_srcdir)/shunit \
+  $(abs_srcdir)/helper.sh $(abs_srcdir)/mock-cmd.sh \
+  $(abs_srcdir)/require_me.sh
 
 EXTRA_DIST = \
 	helper.sh \
 	mock-cmd.sh \
 	require_me.sh \
-	require_me.sh.in $(COMBINED_TESTS) shunit2 $(tests_sources)
+	require_me.sh.in $(TESTS) shunit2 $(tests_sources)
 
 test: check
 test-unit: check