diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d19b25a048..9e02bd3219 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,12 +214,13 @@ stages:
     ${CONFIGURE} \
     --disable-maintainer-mode \
     --enable-developer \
+    --enable-option-checking=fatal \
     --with-cmocka \
     --with-libxml2 \
     --with-json-c \
     --prefix="${BIND_INSTALL_PATH}" \
     $EXTRA_CONFIGURE \
-    || cat config.log
+    || (test -s config.log && cat config.log; exit 1)
 
 .check_readline_setup: &check_readline_setup |
     if [[ -n "${WITHOUT_READLINE}" ]]; then \
diff --git a/util/pairwise-testing.sh b/util/pairwise-testing.sh
index d671e4acf7..9205b5ec47 100755
--- a/util/pairwise-testing.sh
+++ b/util/pairwise-testing.sh
@@ -24,8 +24,7 @@ while read -r -a configure_switches; do
 	mkdir "pairwise-${runid}"
 	cd "pairwise-${runid}"
 	echo "${configure_switches[@]}" | tee "../pairwise-output.${runid}.txt"
-	../configure "${configure_switches[@]}" >> "../pairwise-output.${runid}.txt" 2>&1
-	grep -F "WARNING: unrecognized options:" "../pairwise-output.${runid}.txt" && exit 1
+	../configure --enable-option-checking=fatal "${configure_switches[@]}" >> "../pairwise-output.${runid}.txt" 2>&1
 	make "-j${BUILD_PARALLEL_JOBS:-1}" all >> "../pairwise-output.${runid}.txt" 2>&1
 	cd ..
 	rm -rf "pairwise-${runid}" "pairwise-output.${runid}.txt"