diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index 1b8d91f1..a1bf4926 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -52,12 +52,17 @@ echo "----------------------------------------"
 )
 echo "----------------------------------------"
 
+# Check the database
+make checkdb-${XRAY_SETTINGS} || true
+# Format the database
+make formatdb-${XRAY_SETTINGS}
+
+# Output if the database has differences
 echo
 echo "========================================"
 echo " Database Differences"
 echo "----------------------------------------"
 (
-	make formatdb
 	cd database
 	echo "----------------------------------------"
 	echo " Database Status"
@@ -73,3 +78,6 @@ echo "----------------------------------------"
 	git diff
 )
 echo "----------------------------------------"
+
+# Check the database and fail if it is broken.
+make checkdb-${XRAY_SETTINGS}
diff --git a/.github/kokoro/db-quick.sh b/.github/kokoro/db-quick.sh
index 13c91e10..35c2aa42 100755
--- a/.github/kokoro/db-quick.sh
+++ b/.github/kokoro/db-quick.sh
@@ -25,7 +25,7 @@ source settings/$XRAY_SETTINGS.sh
 
 echo
 echo "========================================"
-echo "Running quick Database build"
+echo "Running quick fuzzer sanity check"
 echo "----------------------------------------"
 (
 	cd fuzzers