diff --git a/CHANGES b/CHANGES
index 23ba22f951d6fc00b969705f069266695c79279c..dd9a32ce561a6f41a6bdc0d9a186bd24157e8e5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ OpenLDAP 2.4.16 Engineering
 	Fixed slapo-syncprov skipped entries with MMR (ITS#5988)
 	Build Environment
 		Cleaned up alloc/free functions for Windows (ITS#6005)
+		Fixed running of autosave files in testsuite (ITS#6026)
 	Documentation
 		admin24 clarified MMR URI requirements (ITS#5942,ITS#5987)
 		Added ldapexop(1) manual page (ITS#5982)
diff --git a/tests/scripts/all b/tests/scripts/all
index 2b0d01130fec5fea5c65a8bfed0211e00742ff9c..9d0ac955f56483c2fb7b378f979b12017674d86e 100755
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -26,6 +26,14 @@ SLEEPTIME=10
 echo ">>>>> Executing all LDAP tests for $BACKEND"
 
 for CMD in $SRCDIR/scripts/test*; do
+	case "$CMD" in
+		*~)		continue;;
+		*.bak)	continue;;
+		*.orig)	continue;;
+		*.sav)	continue;;
+		*)		test -x "$CMD" || continue;;
+	esac
+
 	# remove cruft from prior test
 	if test $PRESERVE = yes ; then
 		/bin/rm -rf $TESTDIR/db.*