diff --git a/maxscale-system-test/mdbci/run_test.sh b/maxscale-system-test/mdbci/run_test.sh
index 450d8518b..15becd0ab 100755
--- a/maxscale-system-test/mdbci/run_test.sh
+++ b/maxscale-system-test/mdbci/run_test.sh
@@ -106,6 +106,7 @@ else
     eval "arguments=(${test_set})"
     ctest -N "${arguments[@]}"
     ctest -VV "${arguments[@]}"
+    ctest --rerun-failed -VV
 fi
 
 if [[ "$name" =~ '-gcov' ]]
diff --git a/maxscale-system-test/mdbci/run_test_snapshot.sh b/maxscale-system-test/mdbci/run_test_snapshot.sh
index bcbbf95d7..d05236a92 100755
--- a/maxscale-system-test/mdbci/run_test_snapshot.sh
+++ b/maxscale-system-test/mdbci/run_test_snapshot.sh
@@ -80,6 +80,7 @@ fi
 
 ulimit -c unlimited
 ctest $test_set -VV
+ctest --rerun-failed -VV
 cp core.* ${logs_publish_dir}
 ${script_dir}/copy_logs.sh