diff --git a/README b/README
index 8ea021026a..4f8a6e1449 100644
--- a/README
+++ b/README
@@ -289,9 +289,10 @@ and will be skipped if these are not available. Some tests require Python
 and the 'dnspython' module and will be skipped if these are not available.
 See bin/tests/system/README for further details.
 
-Unit tests are implemented using cmocka unit testing framework.
-To run them, use configure --with-cmocka, then run make test or
-make unit.
+Unit tests are implemented using the CMocka unit testing framework. To
+build them, use configure --with-cmocka. Execution of tests is done by the
+Kyua test execution engine; if the kyua command is available, then unit
+tests can be run via make test or make unit.
 
 Documentation
 
diff --git a/README.md b/README.md
index ea95a9d6c6..fcad367c3f 100644
--- a/README.md
+++ b/README.md
@@ -307,9 +307,10 @@ and will be skipped if these are not available. Some tests require Python
 and the 'dnspython' module and will be skipped if these are not available.
 See bin/tests/system/README for further details.
 
-Unit tests are implemented using cmocka unit testing framework.
-To run them, use `configure --with-cmocka`, then run `make test` or
-`make unit`.
+Unit tests are implemented using the CMocka unit testing framework.
+To build them, use `configure --with-cmocka`. Execution of tests is done
+by the Kyua test execution engine; if the `kyua` command is available,
+then unit tests can be run via `make test` or `make unit`.
 
 ### <a name="doc"/> Documentation
 
diff --git a/configure b/configure
index 5476a005ee..cc87bb0b48 100755
--- a/configure
+++ b/configure
@@ -19875,7 +19875,7 @@ esac
 
 
 #
-# Check for kyua execution engine if ATF was requested
+# Check for kyua execution engine if CMocka was requested
 # and bail out if execution engine was not found
 #
 
@@ -19926,7 +19926,8 @@ fi
 done
 
        if test -z "$KYUA"; then :
-  as_fn_error $? "kyua test execution engine not found" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kyua test execution engine not found" >&5
+$as_echo "$as_me: WARNING: kyua test execution engine not found" >&2;}
 fi
 fi
 
diff --git a/configure.ac b/configure.ac
index a01bca0a30..41d82d77c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2436,14 +2436,14 @@ AC_SUBST([CMOCKA_LIBS])
 AC_SUBST(UNITTESTS)
 
 #
-# Check for kyua execution engine if ATF was requested
+# Check for kyua execution engine if CMocka was requested
 # and bail out if execution engine was not found
 #
 AC_ARG_VAR([KYUA], [path to kyua execution engine])
 AS_IF([test "$with_cmocka" != "no"],
       [AC_PATH_PROGS([KYUA], [kyua], [])
        AS_IF([test -z "$KYUA"],
-            [AC_MSG_ERROR([kyua test execution engine not found])])])
+            [AC_MSG_WARN([kyua test execution engine not found])])])
 
 AC_SUBST([KYUA])
 
diff --git a/unit/README b/unit/README
index 5775ef87ef..9cdcf9b904 100644
--- a/unit/README
+++ b/unit/README
@@ -1,4 +1,5 @@
-Unit tests for BIND 9 are based on cmocka and test execution engine Kyua.
+Unit tests for BIND 9 are based on the CMocka testing framework and
+the Kyua test execution engine.
 
 If your distribution of choice doesn't include packages for kyua or cmocka, the
 sources can be found here: