diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl
index a2de1fcbdff..6bd6fbe0f03 100644
--- a/mysql-test/lib/mtr_gcov.pl
+++ b/mysql-test/lib/mtr_gcov.pl
@@ -20,25 +20,14 @@
 
 use strict;
 
-# These are not to be prefixed with "mtr_"
+sub gcov_prepare ($) {
+  my ($dir)= @_;
 
-sub gcov_prepare ();
-sub gcov_collect ();
-
-##############################################################################
-#
-#  
-#
-##############################################################################
-
-sub gcov_prepare () {
-
-  `find $::glob_basedir -name \*.gcov \
+  `find $dir -name \*.gcov \
     -or -name \*.da | xargs rm`;
 }
 
-# Used by gcov
-our @mysqld_src_dirs=
+my @mysqld_src_dirs=
   (
    "strings",
    "mysys",
@@ -53,21 +42,24 @@ our @mysqld_src_dirs=
    "sql",
   );
 
-sub gcov_collect () {
+sub gcov_collect ($$$) {
+  my ($dir, $gcov, $gcov_msg, $err)= @_;
+
+  my $start_dir= cwd();
 
   print "Collecting source coverage info...\n";
-  -f $::opt_gcov_msg and unlink($::opt_gcov_msg);
-  -f $::opt_gcov_err and unlink($::opt_gcov_err);
+  -f $gcov_msg and unlink($gcov_msg);
+  -f $gcov_err and unlink($gcov_err);
   foreach my $d ( @mysqld_src_dirs )
   {
-    chdir("$::glob_basedir/$d");
+    chdir("$dir/$d");
     foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) )
     {
-      `$::opt_gcov $f 2>>$::opt_gcov_err  >>$::opt_gcov_msg`;
+      `$gcov $f 2>>$gcov_err  >>$gcov_msg`;
     }
-    chdir($::glob_mysql_test_dir);
+    chdir($start_dir);
   }
-  print "gcov info in $::opt_gcov_msg, errors in $::opt_gcov_err\n";
+  print "gcov info in $gcov_msg, errors in $gcov_err\n";
 }
 
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 59bf70363e8..de0c73847cf 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -257,7 +257,7 @@ sub main {
   command_line_setup(0);
 
   if ( $opt_gcov ) {
-    gcov_prepare();
+    gcov_prepare($basedir);
   }
 
   if (!$opt_suites) {
@@ -346,6 +346,11 @@ sub main {
 
   mtr_print_line();
 
+  if ( $opt_gcov ) {
+    gcov_collect($basedir, $opt_gcov,
+		 $opt_gcov_msg, $opt_gcov_err);
+  }
+
   mtr_report_stats($completed);
 
   exit(0);
@@ -611,11 +616,6 @@ sub run_worker ($) {
 
   command_line_setup($thread_num);
 
-  if ( $opt_gcov )
-  {
-    gcov_prepare();
-  }
-
   setup_vardir();
   check_running_as_root();
   mysql_install_db($thread_num);
@@ -649,16 +649,6 @@ sub run_worker ($) {
 
   stop_all_servers();
 
-  if ( $opt_gcov )
-  {
-    gcov_collect(); # collect coverage information
-  }
-
-  if ( $opt_gcov )
-  {
-    gcov_collect(); # collect coverage information
-  }
-
   exit(1);
 }