diff --git a/t/lib/CompareResults.t b/t/lib/CompareResults.t
index 7f07dc47..5da8d7a4 100644
--- a/t/lib/CompareResults.t
+++ b/t/lib/CompareResults.t
@@ -42,9 +42,6 @@ if ( !$dbh1 ) {
 elsif ( !$dbh2 ) {
    plan skip_all => "Cannot connect to sandbox slave";
 }
-else {
-   plan tests => 57;
-}
 
 Transformers->import(qw(make_checksum));
 
@@ -306,8 +303,8 @@ is_deeply(
 # #############################################################################
 my $tmpdir = '/tmp/mk-upgrade-res';
 SKIP: {
-   skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 30
-      if PerconaTest::load_data_is_disabled($dbh1);
+   skip "LOAD DATA LOCAL INFILE is disabled", 30 unless $can_load_data;
+
 diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
 
 $sb->load_file('master', "t/lib/samples/compare-results.sql");
@@ -684,6 +681,7 @@ is(
    'rows: report, left with more rows'
 );
 }
+
 # #############################################################################
 # Try to compare without having done the actions.
 # #############################################################################
@@ -729,8 +727,8 @@ is_deeply(
 );
 
 SKIP: {
-   skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 2
-      if PerconaTest::load_data_is_disabled($dbh1);
+   skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
+
 $cr = new CompareResults(
    method     => 'rows',
    'base-dir' => $tmpdir,
@@ -781,4 +779,5 @@ diag(`rm -rf /tmp/*outfile.txt`);
 $sb->wipe_clean($dbh1);
 $sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
 exit;