diff --git a/configure.ac b/configure.ac
index 6d7c0c449..b7bded998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1164,6 +1164,7 @@ AC_CONFIG_FILES([Makefile
                  tests/bsim3soifd/Makefile
                  tests/bsim3soipd/Makefile
                  tests/bsim4/Makefile
+                 tests/bsim6/Makefile
                  tests/bsimsoi/Makefile
                  tests/filters/Makefile
                  tests/general/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d1419383..bf4330b21 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS =		\
 	bsim3		\
 	bsim4		\
+	bsim6		\
 	bsimsoi		\
 	hisim		\
 	hisimhv1	\
@@ -22,6 +23,7 @@ DIST_SUBDIRS =		\
 	bsim3soifd	\
 	bsim3soipd	\
 	bsim4		\
+	bsim6		\
 	bsimsoi		\
 	filters		\
 	general		\