diff --git a/configure.ac b/configure.ac
index a4f20725e..e55cd2089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,10 @@ AC_ARG_WITH([ngshared],
 AC_ARG_ENABLE([utf8],
     [AS_HELP_STRING([--disable-utf8], [Don't use utf-8 or tchar (default is UNICODE support with utf-8)])])
 
+# --enable-shortcheck: CMC quality check only for BSIM3/4 to shorten check time
+AC_ARG_ENABLE([shortcheck],
+    [AS_HELP_STRING([--enable-shortcheck], [CMC QA check only for BSIM4/4])])
+
 # old options, not maintained, may even not work at all
 
 # --enable-ansi: try to force --ansi option to the compiler
@@ -1158,6 +1162,8 @@ AC_SUBST([XSPICEDLLIBS])
 
 AM_CONDITIONAL([XSPICE_WANTED], [test "x$enable_xspice" = xyes])
 
+AM_CONDITIONAL([SHORT_CHECK_WANTED], [test "x$enable_shortcheck" = xyes])
+
 
 # Add CIDER enhancements to ngspice.
 if test "x$enable_cider" = xyes; then
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1e7dd2ee7..0730eccbc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,13 @@ if XSPICE_WANTED
 SUBDIRS += xspice
 endif
 
+if SHORT_CHECK_WANTED
+SUBDIRS +=		\
+	bsim3		\
+	bsim4
+endif
+
+if !SHORT_CHECK_WANTED
 SUBDIRS +=		\
 	bsim3		\
 	bsim4		\
@@ -15,6 +22,7 @@ SUBDIRS +=		\
 	hicum2		\
 	hisimhv1	\
 	hisimhv2
+endif
 
 DIST_SUBDIRS =		\
 	bsim1		\