diff --git a/tests/run.in b/tests/run.in
index 8e6bbfb00a..ebaae6173f 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -169,8 +169,8 @@ if test "x$BACKENDTYPE" = "x" ; then
 	BACKENDTYPE="unknown"
 fi
 
-# DB types with indexing, and the main DB types with some other stuff:
-# currently mode, limits, paged results.
+# Backend features.  indexdb: indexing and unchecked limit.
+# maindb: main storage backend.  Currently index,limits,mode,paged results.
 INDEXDB=noindexdb MAINDB=nomaindb
 case $BACKEND in
 	bdb|hdb|mdb) INDEXDB=indexdb MAINDB=maindb ;;
diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 04bddd1456..9d1ec12680 100755
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -501,7 +501,7 @@ case $RC in
 	;;
 esac
 
-if test $MAINDB = maindb ; then
+if test $INDEXDB = indexdb ; then
 
 echo "Testing higher than unchecked limit requested for unchecked limited ID..."
 $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \
diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor
index 4220177ca8..d8cfdb9946 100755
--- a/tests/scripts/test056-monitor
+++ b/tests/scripts/test056-monitor
@@ -100,10 +100,14 @@ echo "Filtering ldapsearch results..."
 $LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT
 
 TMPMONITOROUT2=$MONITOROUT2
-if test $MAINDB != maindb ; then
+case $BACKEND in
+bdb|hdb)
+	;;
+*)
 	TMPMONITOROUT2=$TESTDIR/monitor2.out
 	grep -v "olmBDB" $MONITOROUT2 > $TMPMONITOROUT2
-fi
+	;;
+esac
 
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT