diff --git a/configure b/configure
index 92a608c1cd..bfebc118c6 100755
--- a/configure
+++ b/configure
@@ -22538,7 +22538,9 @@ fi
 
 # Check whether --with-cmocka was given.
 if test "${with_cmocka+set}" = set; then :
-  withval=$with_cmocka;
+  withval=$with_cmocka; :
+else
+  with_cmocka=no
 fi
 
 
diff --git a/configure.in b/configure.in
index 7d5ed67eab..efd60b0807 100644
--- a/configure.in
+++ b/configure.in
@@ -4551,7 +4551,8 @@ AC_SUBST([LIBIDN2_LIBS])
 #
 
 AC_ARG_WITH([cmocka],
-	    [AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])])
+	    [AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])],
+	    [:],[with_cmocka=no])
 
 AS_CASE([$with_cmocka],
 	[no],[:],
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index f074467b97..bb0c8854a8 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -205,7 +205,7 @@
 
 #ifdef UNIT_TESTING
 extern void mock_assert(const int result, const char* const expression,
-                        const char * const file, const int line);
+			const char * const file, const int line);
 #define REQUIRE(expression)						\
 	mock_assert((int)(expression), #expression, __FILE__, __LINE__)
 #define ENSURE(expression)						\