diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0f3aa7ee98c..00aa0299fb7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -915,7 +915,7 @@ sub command_line_setup () {
   if ( ! $opt_suite_timeout )
   {
     $opt_suite_timeout= $default_suite_timeout;
-    $opt_suite_timeout*= 4 if defined $opt_valgrind;
+    $opt_suite_timeout*= 6 if defined $opt_valgrind;
   }
 
   # Increase times to wait for executables to start if using valgrind