--- configure.ac
+++ configure.ac
@@ -104,12 +104,25 @@
 # UI Tool
 # ----------------------------------------------------------
 
-gtkver="gtk+-3.0"
-PKG_CHECK_EXISTS([gtk+-3.0 >= 3.0], [gtkver="gtk+-3.0"], [gtkver="gtk+-2.0"])
-
-PKG_CHECK_MODULES([GTU], [ ${gtkver} ],
+PKG_CHECK_MODULES([GTU], [ gtk+-3.0 >= 3.0 ],
                        [ BUILD_GRILO_TEST_UI=yes ],
                        [ BUILD_GRILO_TEST_UI=no ])
+AC_ARG_ENABLE([test_ui],
+        AS_HELP_STRING([--enable-test-ui],
+                [Enable Grilo Test UI (default: auto)]),
+        [
+                case "$enableval" in
+                     yes)
+                        if test "x$BUILD_GRILO_TEST_UI" = "xno"; then
+                           AC_MSG_ERROR([gtk+-3.0 >= 3.0 not found, install it
+					 or use --disable-test-ui])
+                        fi
+                        ;;
+                     no)
+                        BUILD_GRILO_TEST_UI=no
+                        ;;
+                esac
+        ])
 
 AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$BUILD_GRILO_TEST_UI" = "xyes")