diff --git a/sandbox/prove2junit.pl b/sandbox/prove2junit.pl
index 86de1a88..a6874dbe 100755
--- a/sandbox/prove2junit.pl
+++ b/sandbox/prove2junit.pl
@@ -5,6 +5,7 @@ use warnings;
 
 my $file = $ARGV[0];
 my $testcase = "";
+my $testsuite = "";
 my $error_collect = "";
 my $error_print = "";
 
@@ -14,12 +15,20 @@ if (not defined $file) {
 
 open (my $info, $file) or die "Could not open $file: $!";
 
-print "<testsuite name=\"PT MySQL Test\">\n";
+print "<testsuites name=\"PT-MySQL\">\n";
 while(my $line = <$info>) {
-  if ($line =~ /^(t\/\S+).* (\.*) (skipped:) (.*)$/) { print "<testcase name=\"$1\"><skipped/><system-out>Skip reason:<![CDATA[ $4 ]]></system-out></testcase>\n"; }
+  if ($line =~ /^(t\/)(\S+)(\/)(\S+).* (\.*) (skipped:) (.*)$/) { print "<testcase name=\"$4\"><skipped/><system-out>Skip reason:<![CDATA[ $7 ]]></system-out></testcase>\n"; }
   elsif ($line =~ /^ok (\d+) - (.*)$/) { print "<testcase name=\"$testcase - test $1\"><system-out>Test description:<![CDATA[ $2 ]]></system-out></testcase>\n"; }
   elsif ($line =~ /^not ok (\d+) - (.*)$/) { print "<testcase name=\"$testcase - test $1\"><failure/><system-out>Test description:<![CDATA[ $2 ]]></system-out><system-err><![CDATA[ $error_print ]]></system-err></testcase>\n"; }
-  elsif ($line =~ /^(t\/\S+).* (\.*) $/) { $testcase = "$1"; $error_print = $error_collect; $error_collect = ""; }
+  elsif ($line =~ /^(t\/)(\S+)(\/)(\S+).* (\.*) $/) {
+    if ( "$2" eq "$testsuite" ) {
+      $testcase = "$4"; $error_print = $error_collect; $error_collect = "";
+    }
+    else {
+      if ( "$testsuite" ne "" ) { print "</testsuite>\n"; }
+      $testsuite = "$2"; $testcase = "$4"; $error_print = $error_collect; $error_collect = ""; print "<testsuite name=\"$testsuite\">\n";
+    }
+  }
   elsif ($line !~ /^ok$/ && $line !~ /^\d+..\d+$/) { $error_collect = $error_collect . $line; }
 }
-print "</testsuite>\n"
+print "</testsuite>\n</testsuites>\n";