diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 7c1803cd0..0777c0de2 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -138,18 +138,23 @@ CHECK_TM_INCLUDES_TM_GMTOFF
 
 AC_ARG_ENABLE([vty_tests],
 		AC_HELP_STRING([--enable-vty-tests],
-				[Include the VTY tests in make check [default=no]]),
-		[enable_vty_tests="$enableval"],[enable_vty_tests="no"])
-if test "x$enable_vty_tests" = "xyes" ; then
+				[Include the VTY/CTRL tests in make check (deprecated)
+				[default=no]]),
+		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
+AC_ARG_ENABLE([ext_tests],
+		AC_HELP_STRING([--enable-external-tests],
+				[Include the VTY/CTRL tests in make check [default=no]]),
+		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
+if test "x$enable_ext_tests" = "xyes" ; then
 	AM_PATH_PYTHON
-	AC_CHECK_PROG(OSMOTESTVTY_CHECK,osmotestvty.py,yes)
-	 if test "x$OSMOTESTVTY_CHECK" != "xyes" ; then
-		AC_MSG_ERROR([Please install osmocom-python to run the vty tests.])
+	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
+	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
+		AC_MSG_ERROR([Please install osmocom-python to run the VTY/CTRL tests.])
 	fi
 fi
-AC_MSG_CHECKING([whether to enable VTY tests])
-AC_MSG_RESULT([$enable_vty_tests])
-AM_CONDITIONAL(ENABLE_VTY_TESTS, test "x$enable_vty_tests" = "xyes")
+AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
+AC_MSG_RESULT([$enable_ext_tests])
+AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
 
 dnl Generate the output
 AM_CONFIG_HEADER(bscconfig.h)
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index a29d9fb52..7bb871218 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) vty_test_runner.py c
 TESTSUITE = $(srcdir)/testsuite
 DISTCLEANFILES = atconfig
 
-if ENABLE_VTY_TESTS
+if ENABLE_EXT_TESTS
 python-tests: $(BUILT_SOURCES)
 	osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
 	osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v