diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7778b99ea65..995baf2c0dd 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1749,6 +1749,11 @@ sub environment_setup () {
       print "Using IM_MYSQLD2_PORT       = $ENV{IM_MYSQLD2_PORT}\n";
     }
   }
+
+  # Create an environment variable to make it possible
+  # to detect that valgrind is being used from test cases
+  $ENV{'VALGRIND_TEST'}= $opt_valgrind;
+
 }
 
 
@@ -4009,11 +4014,6 @@ sub run_mysqltest ($) {
     mtr_add_arg($args, "--big-test");
   }
 
-  if ( $opt_valgrind )
-  {
-    mtr_add_arg($args, "--valgrind");
-  }
-
   if ( $opt_compress )
   {
     mtr_add_arg($args, "--compress");