diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c2e9bd7cf65..c1fca25c477 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -291,6 +291,7 @@ sub main {
   mtr_print_thick_line();
   mtr_print_header();
 
+  my $num_tests= @$tests;
   my $completed= run_test_server($server, $tests, $opt_parallel);
 
   # Send Ctrl-C to any children still running
@@ -308,6 +309,12 @@ sub main {
     }
   }
 
+  if ( @$completed != $num_tests){
+    # Not all tests completed, failure
+    mtr_error("Test failed.",
+	      "To continue, re-run with '--force'");
+  }
+
   mtr_verbose("Server exit\n");
 
   mtr_print_line();