diff --git a/c/Makefile.am b/c/Makefile.am
index c4308f2c9..d4b9744dd 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=		lib cli stream input mapping output containers dsls experimental tools . reg_test
+SUBDIRS=		lib cli stream input mapping output containers dsls experimental tools . unit_test reg_test
 
 AM_CPPFLAGS=		-I${srcdir}
 AM_CFLAGS=		-Wall -Werror -std=gnu99 -O3
diff --git a/configure.ac b/configure.ac
index e5dad2dbf..22bdd4610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,10 +31,11 @@ AC_CONFIG_FILES([Makefile
 		c/mapping/Makefile
 		c/output/Makefile
 		c/stream/Makefile
-		c/test/Makefile
-		c/test/expected/Makefile
-		c/test/input/Makefile
-		c/test/input/rfc-csv/Makefile
+		c/unit_test/Makefile
+		c/reg_test/Makefile
+		c/reg_test/expected/Makefile
+		c/reg_test/input/Makefile
+		c/reg_test/input/rfc-csv/Makefile
 		c/tools/Makefile
 		c/Makefile
 		doc/Makefile])