diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index ba6a37a..995a15d 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -49,7 +49,7 @@ run_setup()
    if [ "x$use_meson" = "x" ]; then
       if [ -d "$VIRGL_PATH" ]; then
           cd $VIRGL_PATH
-          ./autogen.sh --prefix=/usr/local --enable-debug --enable-tests
+          ./autogen.sh --prefix=/usr/local --enable-debug --enable-tests --enable-autotools
           make -j$NUM_THREADS install
       fi
    else
@@ -93,7 +93,7 @@ run_make_check_meson()
 
 run_deqp()
 {
-   run_setup
+   run_setup meson
    OGL_BACKEND="$1"
    SUITE="$2"
 
@@ -135,7 +135,7 @@ run_deqp()
 
 run_piglit()
 {
-   run_setup
+   run_setup meson
 
    OGL_BACKEND="$1"
 
diff --git a/configure.ac b/configure.ac
index dbcd229..387f964 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,19 @@ AC_PREREQ([2.60])
 
 AC_INIT([virglrenderer], [0.8.0],
     [virglrenderer-devel@lists.freedesktop.org])
+
+AC_ARG_ENABLE(autotools,
+	      AS_HELP_STRING([--enable-autotools],
+              [Enable the use of the now deprecated autotools build]),
+	      [force_autotools=$enableval])
+
+if test "x$force_autotools" != "xyes"; then
+  AC_MSG_ERROR([The autotools build system is deprecated, please try the
+  new meson build system.
+    > meson <src-dir> [<build-dir>]
+  To force the use of autotools run configure with --enable-autotools])
+fi
+
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])