diff --git a/bin/pt-archiver b/bin/pt-archiver
index 09909851..d5ec2e58 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -2142,7 +2142,7 @@ sub get_cxn_params {
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
                      qw(F h P S A))
-         . ';mysql_read_default_group=client';
+         . ';mysql_read_default_group=client;mysql_local_infile=1';
    }
    PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
@@ -4837,7 +4837,7 @@ sub encode_client_response {
       next unless exists $versions->{$item};
       if ( ref($versions->{$item}) eq 'HASH' ) {
          my $mysql_versions = $versions->{$item};
-         for my $id ( keys %$mysql_versions ) {
+         for my $id ( sort keys %$mysql_versions ) {
             push @lines, join(';', $id, $item, $mysql_versions->{$id});
          }
       }
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 29450d74..b59336b4 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -245,7 +245,7 @@ sub get_cxn_params {
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
                      qw(F h P S A))
-         . ';mysql_read_default_group=client';
+         . ';mysql_read_default_group=client;mysql_local_infile=1';
    }
    PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
@@ -11334,7 +11334,7 @@ sub encode_client_response {
       next unless exists $versions->{$item};
       if ( ref($versions->{$item}) eq 'HASH' ) {
          my $mysql_versions = $versions->{$item};
-         for my $id ( keys %$mysql_versions ) {
+         for my $id ( sort keys %$mysql_versions ) {
             push @lines, join(';', $id, $item, $mysql_versions->{$id});
          }
       }
diff --git a/t/lib/CompareResults.t b/t/lib/CompareResults.t
index 5da8d7a4..957f579c 100644
--- a/t/lib/CompareResults.t
+++ b/t/lib/CompareResults.t
@@ -303,7 +303,6 @@ is_deeply(
 # #############################################################################
 my $tmpdir = '/tmp/mk-upgrade-res';
 SKIP: {
-   skip "LOAD DATA LOCAL INFILE is disabled", 30 unless $can_load_data;
 
 diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
 
@@ -727,7 +726,6 @@ is_deeply(
 );
 
 SKIP: {
-   skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
 
 $cr = new CompareResults(
    method     => 'rows',
diff --git a/t/pt-archiver/basics.t b/t/pt-archiver/basics.t
index b3c6c5d8..4a95ce19 100644
--- a/t/pt-archiver/basics.t
+++ b/t/pt-archiver/basics.t
@@ -186,7 +186,6 @@ cmp_ok(
 # Bug 903387: pt-archiver doesn't honor b=1 flag to create SQL_LOG_BIN statement
 # #############################################################################
 SKIP: {
-   skip('LOAD DATA LOCAL INFILE is disabled', 3) if !$can_load_data;
    $sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
    $sb->wait_for_slaves();
 
diff --git a/t/pt-archiver/bulk_insert.t b/t/pt-archiver/bulk_insert.t
index 4727f7f7..7b2c1c2b 100644
--- a/t/pt-archiver/bulk_insert.t
+++ b/t/pt-archiver/bulk_insert.t
@@ -22,9 +22,6 @@ my $dbh = $sb->get_dbh_for('master');
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-elsif ( !$can_load_data ) {
-   plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
-}
 
 my $output;
 my $rows;
diff --git a/t/pt-archiver/bulk_regular_insert.t b/t/pt-archiver/bulk_regular_insert.t
index 13879833..da71c29b 100644
--- a/t/pt-archiver/bulk_regular_insert.t
+++ b/t/pt-archiver/bulk_regular_insert.t
@@ -22,9 +22,6 @@ my $dbh = $sb->get_dbh_for('master');
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-elsif ( !$can_load_data ) {
-    plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
-}
 
 my $output;
 my $cnf = "/tmp/12345/my.sandbox.cnf";
diff --git a/t/pt-upgrade/basics.t b/t/pt-upgrade/basics.t
index 0061521c..ef276695 100644
--- a/t/pt-upgrade/basics.t
+++ b/t/pt-upgrade/basics.t
@@ -61,9 +61,6 @@ ok(
    'Report for multiple queries (checksum method)'
 );
 
-SKIP: {
-   skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
-   
    ok(
       no_diff(
          sub { pt_upgrade::main(@args, "$trunk/$sample/001/select-one.log",
@@ -81,7 +78,6 @@ SKIP: {
       ),
       'Report for multiple queries (rows method)'
    );
-}
 
 ok(
    no_diff(
diff --git a/t/pt-upgrade/warnings.t b/t/pt-upgrade/warnings.t
index d745a63e..67fe8936 100644
--- a/t/pt-upgrade/warnings.t
+++ b/t/pt-upgrade/warnings.t
@@ -15,13 +15,6 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
-# This test calls pt-upgrade with --compare-results-method rows
-# which use LOAD DATA LOCAL INFILE.  If LOAD DATA is disabled,
-# then this this test can't run.
-if ( !$can_load_data ) {
-   plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
-}
-
 # This runs immediately if the server is already running, else it starts it.
 diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);