diff --git a/CHANGES b/CHANGES
index 93fc93b70114943527cd8b1fa8b8e70990a9d52e..7afabffd2d2fb18478188eb514ab603a9d9c403f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ OpenLDAP 2.4.18 Engineering
 	Fixed tools resource leaks (ITS#6145)
 	Fixed contrib/autogroup with RE24 (ITS#6227)
 	Build Environment
+		Tests note which backend is being tested (ITS#5810)
 		Fixed test056-monitor with custom ports (ITS#6213)
 
 OpenLDAP 2.4.17 Release (2009/07/13)
diff --git a/tests/run.in b/tests/run.in
index 3318798045df1cab08e1a8ab31f20c76bc7ab4d4..af8a79db2b0bd011616f8408bbefc0e9a59744c1 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -225,7 +225,7 @@ fi
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
 
-echo "Running ${SCRIPT}..."
+echo "Running ${SCRIPT} for ${BACKEND}..."
 while [ $COUNTER -le $LOOP ]; do
 	if [ $LOOP -gt 1 ]; then
 		echo "Running $COUNTER of $LOOP iterations"
diff --git a/tests/scripts/all b/tests/scripts/all
index 1dbf4d85b5295f0f66651a1bb5d47175d2d9c5e5..69983a131de5a748027b2cd3ad4b0aab3816889d 100755
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -51,13 +51,13 @@ for CMD in $SRCDIR/scripts/test*; do
 EOF
 	fi
 
-	echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
+	echo ">>>>> Starting ${TB}`basename $CMD`${TN} for $BACKEND..."
 	$CMD
 	RC=$?
 	if test $RC -eq 0 ; then
-		echo ">>>>> $CMD completed ${TB}OK${TN}."
+		echo ">>>>> $CMD completed ${TB}OK${TN} for $BACKEND."
 	else
-		echo ">>>>> $CMD ${TB}failed${TN} (exit $RC)"
+		echo ">>>>> $CMD ${TB}failed${TN} for $BACKEND (exit $RC)"
 		exit $RC
 	fi