diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 7ec4b2d023..aa0648ff36 100755
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -196,7 +196,7 @@ $PERL stop.pl $systest
 status=`expr $status + $?`
 
 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 6089b16770..3304e81f22 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -56,7 +56,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}"