diff --git a/sandbox/start-sandbox b/sandbox/start-sandbox
index acea7989..6583ad06 100755
--- a/sandbox/start-sandbox
+++ b/sandbox/start-sandbox
@@ -122,8 +122,12 @@ make_sandbox() {
     fi
 
     if [ -n "$GTID" ]; then
-        #echo "gtid_mode=on" >> ${TMP_DIR}/$port/my.sandbox.cnf
-        echo "gtid_mode=ON_PERMISSIVE" >> ${TMP_DIR}/$port/my.sandbox.cnf
+        if [ "$version" "<" '5.7' ]; then
+            echo "gtid_mode=on" >> ${TMP_DIR}/$port/my.sandbox.cnf
+        fi
+        if [ ! "$version" "<" '5.7' ]; then
+            echo "gtid_mode=ON_PERMISSIVE" >> ${TMP_DIR}/$port/my.sandbox.cnf
+        fi
         echo "enforce_gtid_consistency" >> ${TMP_DIR}/$port/my.sandbox.cnf
     fi
     if [ -n "$REPLICATION_THREADS" ]; then
@@ -143,7 +147,7 @@ make_sandbox() {
 
     if [ $generating_database -eq 1 ]; then
         echo "Creating default databases ..."
-        if [ "$version" > "5.6" ]; then
+        if [ "$version" ">" "5.6" ]; then
             rm -f ${TMP_DIR}/empty-defaults.txt
             touch ${TMP_DIR}/empty-defaults.txt
             rm -rf ${TMP_DIR}/$port/data
diff --git a/t/pt-slave-restart/gtid.t b/t/pt-slave-restart/gtid.t
index 8afcdb2c..aa64ca9b 100644
--- a/t/pt-slave-restart/gtid.t
+++ b/t/pt-slave-restart/gtid.t
@@ -19,7 +19,9 @@ if ( $sandbox_version lt '5.6' ) {
    plan skip_all => "Requires MySQL 5.6";
 }
 
+diag('Restarting the sandbox');
 diag(`SAKILA=0 GTID=1 $trunk/sandbox/test-env restart`);
+diag("Sandbox restarted");
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);