diff --git a/configure.ac b/configure.ac
index 5e7de83c..96c5f0f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,10 +86,9 @@ glib_version="`pkg-config --modversion glib-2.0`"
 # gtest was introduced in glib 2.16; but we're also using
 # g_test_log_set_fatal_handler, which was introduced in 2.22
 PKG_CHECK_MODULES(g_test,glib-2.0 >= 2.22, [have_gtest=yes],[have_gtest=no])
-AM_CONDITIONAL(HAVE_GTEST, test "x$have_gtest" = "xyes")
-AM_CONDITIONAL(HAVE_GLIB216, test "x$have_gtest" = "xyes")
+AM_CONDITIONAL(BUILD_TESTS, test "x$have_gtest" = "xyes")
 AS_IF([test "x$have_gtest" = "xno"],[
-     AC_MSG_WARN([You need GLIB version >= 2.16 to build the tests])
+     AC_MSG_WARN([You need GLIB version >= 2.22 to build the tests])
 ])