diff --git a/Makefile.am b/Makefile.am
index 306f657..1ff8d76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,12 @@ EXTRA_DIST = t t/test-bi.hcl
 SUBDIRS =
 
 if ENABLE_STATIC_MODULE
-SUBDIRS += mod lib bin
+SUBDIRS += mod lib bin t
 else
-SUBDIRS += lib mod bin
+SUBDIRS += lib mod bin t
 endif
 
-DIST_SUBDIRS = $(SUBDIRS) ##t
+DIST_SUBDIRS = $(SUBDIRS)
 
 distclean-local:
 	@rm -rf $(top_srcdir)/autom4te.cache
diff --git a/Makefile.in b/Makefile.in
index a5a3a83..fa94887 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,8 +87,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_STATIC_MODULE_TRUE@am__append_1 = mod lib bin
-@ENABLE_STATIC_MODULE_FALSE@am__append_2 = lib mod bin
+@ENABLE_STATIC_MODULE_TRUE@am__append_1 = mod lib bin t
+@ENABLE_STATIC_MODULE_FALSE@am__append_2 = lib mod bin t
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
@@ -165,8 +165,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \
 	$(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \
 	$(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \
 	$(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \
-	ac/compile ac/config.guess ac/config.sub ac/install-sh \
-	ac/ltmain.sh ac/missing
+	ac/compile ac/config.guess ac/config.sub ac/depcomp \
+	ac/install-sh ac/ltmain.sh ac/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -346,7 +346,7 @@ AUTOMAKE_OPTION = foreign
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = t t/test-bi.hcl
 SUBDIRS = $(am__append_1) $(am__append_2)
-DIST_SUBDIRS = $(SUBDIRS) ##t
+DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/t/Makefile.am b/t/Makefile.am
index b8e022c..df8bc71 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -13,5 +13,5 @@ check_PROGRAMS =
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 TEST_EXTENSIONS = .hcl
-HCL_LOG_COMPILER = ../bin/hcl
+HCL_LOG_COMPILER = sh $(abs_srcdir)/run.sh ../bin/hcl
 AM_HCL_LOG_FLAGS =
diff --git a/t/Makefile.in b/t/Makefile.in
index 204b579..bedb78c 100644
--- a/t/Makefile.in
+++ b/t/Makefile.in
@@ -467,7 +467,7 @@ check_SCRIPTS = \
 
 EXTRA_DIST = $(check_SCRIPTS)
 TEST_EXTENSIONS = .hcl
-HCL_LOG_COMPILER = ../bin/hcl
+HCL_LOG_COMPILER = sh $(abs_srcdir)/run.sh ../bin/hcl
 AM_HCL_LOG_FLAGS = 
 all: all-am
 
diff --git a/t/run.sh b/t/run.sh
new file mode 100644
index 0000000..c3e105d
--- /dev/null
+++ b/t/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+$@ | grep -E ^ERROR: && exit 1
+exit 0