diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index c59a3e2cfd..0d291a4b01 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -252,7 +252,7 @@ else
 fi
 
 get_core_dumps() {
-    find "$systest/" \( -name 'core*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort
+    find "$systest/" \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort
 }
 
 core_dumps=$(get_core_dumps | tr '\n' ' ')
diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index dbd8684c69..33e6fc2c74 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -61,7 +61,7 @@ if [ -n "${FAILED_TESTS}" ]; then
 	status=1
 fi
 
-CRASHED_TESTS=$(find . -name 'core*' -or -name '*.core' | cut -d'/' -f2 | sort -u | sed -e 's/^/I:      /')
+CRASHED_TESTS=$(find . \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.txt' | cut -d'/' -f2 | sort -u | sed -e 's/^/I:      /')
 if [ -n "${CRASHED_TESTS}" ]; then
 	echoinfo "I:Core dumps were found for the following system tests:"
 	echoinfo "${CRASHED_TESTS}"