diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index feb51eef..6a6c441d 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -3464,7 +3464,7 @@ sub new {
 
    my ($row_est, $mysql_index) = _get_row_estimate(%args);
    my $one_nibble = !defined $args{one_nibble} || $args{one_nibble}
-                  ? $row_est < $chunk_size * $o->get('chunk-size-limit')
+                  ? $row_est <= $chunk_size * $o->get('chunk-size-limit')
                   : 0;
    MKDEBUG && _d('One nibble:', $one_nibble ? 'yes' : 'no');
 
@@ -6275,10 +6275,10 @@ sub exec_nibble {
                # this error message.  (So don't wrap it in ts().)
                die "Checksum query for table $tbl->{db}.$tbl->{tbl} "
                   . "caused MySQL error $code:\n"
-                  . "    Level: " . ($warning->{level} || '')   . "\n"
-                  . "     Code: " . ($warning->{code} || '')    . "\n"
+                  . "    Level: " . ($warning->{level}   || '') . "\n"
+                  . "     Code: " . ($warning->{code}    || '') . "\n"
                   . "  Message: " . ($warning->{message} || '') . "\n"
-                  . "    Query: " . $sth->{Statement}           . "\n";
+                  . "    Query: " . $sth->{nibble}->{Statement} . "\n";
             }
          }
 
@@ -7503,7 +7503,7 @@ Only read default options from the given file
 
 =item * h
 
-dsn: host; copy: no
+dsn: host; copy: yes
 
 Connect to host.
 
diff --git a/lib/NibbleIterator.pm b/lib/NibbleIterator.pm
index 5ccddaa6..973e69a5 100644
--- a/lib/NibbleIterator.pm
+++ b/lib/NibbleIterator.pm
@@ -60,7 +60,7 @@ sub new {
 
    my ($row_est, $mysql_index) = _get_row_estimate(%args);
    my $one_nibble = !defined $args{one_nibble} || $args{one_nibble}
-                  ? $row_est < $chunk_size * $o->get('chunk-size-limit')
+                  ? $row_est <= $chunk_size * $o->get('chunk-size-limit')
                   : 0;
    MKDEBUG && _d('One nibble:', $one_nibble ? 'yes' : 'no');
 
diff --git a/t/lib/NibbleIterator.t b/t/lib/NibbleIterator.t
index 62eeb201..cf7a0b17 100644
--- a/t/lib/NibbleIterator.t
+++ b/t/lib/NibbleIterator.t
@@ -39,7 +39,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 29;
+   plan tests => 30;
 }
 
 my $q   = new Quoter();
@@ -602,6 +602,28 @@ cmp_ok(
    "row_estimate()"
 );
 
+
+# ############################################################################
+# Empty table.
+# ############################################################################
+$ni = make_nibble_iter(
+   db         => 'mysql',
+   tbl        => 'host',
+   argv       => [qw(--tables mysql.host --chunk-size-limit 0)],
+);
+
+@rows = ();
+while (my $row = $ni->next()) {
+   push @rows, @$row;
+}
+
+is_deeply(
+   \@rows,
+   [ ],
+   "--chunk-size-limit 0 on empty table"
+);
+
+
 # #############################################################################
 # Done.
 # #############################################################################
diff --git a/t/pt-table-checksum/create_replicate_table.t b/t/pt-table-checksum/create_replicate_table.t
index 51f8611f..4a05e591 100644
--- a/t/pt-table-checksum/create_replicate_table.t
+++ b/t/pt-table-checksum/create_replicate_table.t
@@ -74,8 +74,8 @@ my $create_repl_table =
   chunk          int          NOT NULL,
   chunk_time     float            NULL,
   chunk_index    varchar(200)     NULL,
-  lower_boundary text         NOT NULL,
-  upper_boundary text         NOT NULL,
+  lower_boundary text             NULL,
+  upper_boundary text             NULL,
   this_crc       char(40)     NOT NULL,
   this_cnt       int          NOT NULL,
   master_crc     char(40)         NULL,
diff --git a/t/pt-table-checksum/issue_982.t b/t/pt-table-checksum/issue_982.t
index abe1ed05..cffdbdbd 100644
--- a/t/pt-table-checksum/issue_982.t
+++ b/t/pt-table-checksum/issue_982.t
@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More;
+use Test::More skip_all => 'Finish updating issue_982.t';
 
 use PerconaTest;
 use Sandbox;
@@ -18,45 +18,36 @@ require "$trunk/bin/pt-table-checksum";
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $slave1_dbh = $sb->get_dbh_for('slave1');
 
 if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-if ( !$slave_dbh ) {
+if ( !$slave1_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
    plan tests => 8;
 }
 
-my $rows;
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --lock-wait-timeout=3 else the tool will die.
+my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($master_dsn, qw(--lock-wait-timeout 3)); 
+my $row;
 my $output;
-my $cnf = '/tmp/12345/my.sandbox.cnf';
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-checksum/samples/checksum_tbl.sql');
-
-# Normally checksum tbl is InnoDB but mk-table-checksum commits a txn
-# for each chunk which is really slow.  Using MyISAM takes a minute off
-# the runtime of this test.
-$master_dbh->do("alter table test.checksum engine=myisam");
 
 # #############################################################################
 # Issue 982: --empty-replicate-table does not work with binlog-ignore-db
 # #############################################################################
 
-$master_dbh->do("insert into test.checksum (db,tbl,chunk) values ('db','tbl',0)");
-sleep 1;
-
-$rows = $slave_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$rows,
-   1,
-   "Slave checksum table has row"
-);
+$sb->wipe_clean($master_dbh);
+pt_table_checksum::main(@args, qw(-t sakila.country --quiet));
+$master_dbh->do("insert into percona.checksums values ('sakila', 'country', 99, null, null, null, null, '', 0, '', 0, null)");
+PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', "db='sakila' and tbl='country' and chunk=99");
 
 $master_dbh->disconnect();
-$slave_dbh->disconnect();
+$slave1_dbh->disconnect();
 
 # Add a replication filter to the slave.
 diag(`/tmp/12346/stop >/dev/null`);
@@ -68,32 +59,31 @@ diag(`/tmp/12345/start >/dev/null`);
 diag(`/tmp/12346/start >/dev/null`);
 
 $output = output(
-   sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
-      qw(--replicate=test.checksum -d mysql -t user --empty-replicate-table))
-   },
+   sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
+      qw(-d mysql -t user)) },
    stderr => 1,
 );
 
 $master_dbh = $sb->get_dbh_for('master');
-$slave_dbh  = $sb->get_dbh_for('slave1');
+$slave1_dbh = $sb->get_dbh_for('slave1');
 
-$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='db'");
+$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='country' and chunk=99");
 ok(
-   @$rows == 0,
+   @$row == 0,
    "Slave checksum table deleted"
 );
 
 # Clear checksum table for next tests.
-$master_dbh->do("truncate table test.checksum");
-sleep 1;
-$rows = $slave_dbh->selectall_arrayref("select * from test.checksum");
-ok(
-   !@$rows,
-   "Checksum table empty on slave"
+$master_dbh->do("truncate table percona.checksums");
+wait_until(
+   sub {
+      $row = $slave1_dbh->selectall_arrayref("select * from percona.checksums");
+      return !@$row;
+   }
 );
 
 $master_dbh->disconnect();
-$slave_dbh->disconnect();
+$slave1_dbh->disconnect();
 
 # Restore original config.
 diag(`/tmp/12346/stop >/dev/null`);
@@ -111,11 +101,11 @@ diag(`/tmp/12345/start >/dev/null`);
 diag(`/tmp/12346/start >/dev/null`);
 
 $master_dbh = $sb->get_dbh_for('master');
-$slave_dbh  = $sb->get_dbh_for('slave1');
+$slave1_dbh = $sb->get_dbh_for('slave1');
 
 $output = output(
-   sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
-      qw(--replicate=test.checksum -d mysql -t user))
+   sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
+      qw(--replicate=percona.checksums -d mysql -t user))
    },
    stderr => 1,
 );
@@ -124,34 +114,34 @@ $output = output(
 # have done USE mysql before updating the checksum table.  Thus, the
 # checksums should show up on the slave.
 sleep 1;
-$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='mysql' AND tbl='user'");
+$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
 ok(
-   @$rows == 1,
+   @$row == 1,
    "Checksum replicated with binlog-do-db, without --replicate-database"
 );
 
 # Now force --replicate-database test and the checksums should not replicate.
 
 $master_dbh->do("use mysql");
-$master_dbh->do("truncate table test.checksum");
+$master_dbh->do("truncate table percona.checksums");
 sleep 1;
-$rows = $slave_dbh->selectall_arrayref("select * from test.checksum");
+$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums");
 ok(
-   !@$rows,
+   !@$row,
    "Checksum table empty on slave"
 );
 
 $output = output(
-   sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
-      qw(--replicate=test.checksum -d mysql -t user),
+   sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
+      qw(--replicate=percona.checksums -d mysql -t user),
       qw(--replicate-database test))
    },
    stderr => 1,
 );
 sleep 1;
-$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='mysql' AND tbl='user'");
+$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
 ok(
-   !@$rows,
+   !@$row,
    "Checksum did not replicated with binlog-do-db, with --replicate-database"
 );
 
@@ -159,7 +149,7 @@ ok(
 # Restore original config.
 # #############################################################################
 $master_dbh->disconnect();
-$slave_dbh->disconnect();
+$slave1_dbh->disconnect();
 
 diag(`/tmp/12346/stop >/dev/null`);
 diag(`/tmp/12345/stop >/dev/null`);
@@ -168,7 +158,7 @@ diag(`/tmp/12345/start >/dev/null`);
 diag(`/tmp/12346/start >/dev/null`);
 
 $master_dbh = $sb->get_dbh_for('master');
-$slave_dbh  = $sb->get_dbh_for('slave1');
+$slave1_dbh = $sb->get_dbh_for('slave1');
 
 # #############################################################################
 # Test it again by looking at binlog to see that the db didn't change.
@@ -181,15 +171,15 @@ sleep 1;
 my $it = "payment,rental,help_topic,help_keyword,inventory,film_actor";
 
 $output = output(
-   sub { pt_table_checksum::main("F=$cnf",
-      qw(--replicate=test.checksum), '--ignore-tables', $it, qw(--chunk-size 20k))
+   sub { pt_table_checksum::main(@args,
+      qw(--replicate=percona.checksums), '--ignore-tables', $it, qw(--chunk-size 20k))
    },
    stderr => 1,
 );
 sleep 1;
 
-my $row = $master_dbh->selectrow_hashref('show master status');
-$output = `mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning' |  sort -u`;
+$row = $master_dbh->selectrow_hashref('show master status');
+$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning' |  sort -u`;
 is(
    $output,
 "use mysql/*!*/;
@@ -203,15 +193,15 @@ diag(`$trunk/sandbox/test-env reset`);
 sleep 1;
 
 $output = output(
-   sub { pt_table_checksum::main("F=$cnf", qw(--replicate-database test),
-      qw(--replicate=test.checksum), '--ignore-tables', $it, qw(--chunk-size 20k))
+   sub { pt_table_checksum::main(@args, qw(--replicate-database test),
+      qw(--replicate=percona.checksums), '--ignore-tables', $it, qw(--chunk-size 20k))
    },
    stderr => 1,
 );
 sleep 1;
 
 $row = $master_dbh->selectrow_hashref('show master status');
-$output = `mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning'`;
+$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning'`;
 is(
    $output,
 "use test/*!*/;
diff --git a/t/pt-table-checksum/option_sanity.t b/t/pt-table-checksum/option_sanity.t
index 51784893..85730276 100644
--- a/t/pt-table-checksum/option_sanity.t
+++ b/t/pt-table-checksum/option_sanity.t
@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 16;
+use Test::More tests => 17;
 
 use PerconaTest;
 require "$trunk/bin/pt-table-checksum";
@@ -137,6 +137,16 @@ like(
    "--replicate table must be database-qualified"
 );
 
+# ############################################################################
+# --chunk-size-limit >= 1 or 0
+# ############################################################################
+$output = `$trunk/bin/pt-table-checksum --chunk-size-limit 0.999`;
+like(
+   $output,
+   qr/chunk-size-limit must be >= 1 or 0 to disable/,
+   "--chunk-size-limit must be >= 1 or 0"
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
diff --git a/t/pt-table-checksum/oversize_chunks.t b/t/pt-table-checksum/oversize_chunks.t
index a30995fe..5137da28 100644
--- a/t/pt-table-checksum/oversize_chunks.t
+++ b/t/pt-table-checksum/oversize_chunks.t
@@ -9,33 +9,45 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More;
+use Test::More skip_all => 'Finish updating oversize_chunks.t';
 
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-table-checksum";
 
-my $vp  = new VersionParser();
-my $dp  = new DSNParser(opts=>$dsn_opts);
-my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
 
-if ( !$dbh ) {
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master');
+
+if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 2;
 }
 
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --lock-wait-timeout=3 else the tool will die.
+my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($master_dsn, qw(--lock-wait-timeout 3)); 
+my $row;
 my $output;
-my $cnf='/tmp/12345/my.sandbox.cnf';
-my @args = ('-F', $cnf, 'h=127.1', qw(-t osc.t --chunk-size 10));
 
-diag(`/tmp/12345/use < $trunk/t/pt-table-checksum/samples/oversize-chunks.sql`);
+$sb->load_file('master', "t/pt-table-checksum/samples/oversize-chunks.sql");
+
+# pt-table-checksum 2.0 isn't fooled as easily as 1.0 was.  This
+# test results in:
+#    Error checksumming table osc.t: Possible infinite loop detected!
+#    The lower boundary for chunk 2 is <13, 13> and the lower boundary
+#    for chunk 3 is also <13, 13>.  This usually happens when using a
+#    non-unique single column index.  The current chunk index for table
+#    osc.t is i which is not unique and covers 1 column.
 
 ok(
    no_diff(
-      sub { pt_table_checksum::main(@args) },
+      sub { pt_table_checksum::main(@args,
+         qw(-t osc.t --chunk-size 10)) },
       "t/pt-table-checksum/samples/oversize-chunks.txt",
    ),
    "Skip oversize chunk"
@@ -43,21 +55,15 @@ ok(
 
 ok(
    no_diff(
-      sub { pt_table_checksum::main(@args, qw(--chunk-size-limit 0)) },
+      sub { pt_table_checksum::main(@args,
+         qw(-t osc.t --chunk-size 10 --chunk-size-limit 0)) },
       "t/pt-table-checksum/samples/oversize-chunks-allowed.txt"
    ),
    "Allow oversize chunk"
 );
 
-$output = `$trunk/bin/pt-table-checksum -F $cnf h=127.1 --chunk-size-limit 0.999 --chunk-size 100 2>&1`;
-like(
-   $output,
-   qr/chunk-size-limit must be >= 1 or 0 to disable/,
-   "Verify --chunk-size-limit size"
-);
-
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($dbh);
+$sb->wipe_clean($master_dbh);
 exit;
diff --git a/t/pt-table-checksum/throttle.t b/t/pt-table-checksum/throttle.t
index 01676bc6..7a74338f 100644
--- a/t/pt-table-checksum/throttle.t
+++ b/t/pt-table-checksum/throttle.t
@@ -15,10 +15,6 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-table-checksum";
 
-diag(`$trunk/sandbox/test-env reset`);
-diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
-diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
-
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $master_dbh = $sb->get_dbh_for('master');
@@ -35,19 +31,17 @@ elsif ( !$slave2_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave2';
 }
 else {
-   plan tests => 21;
+   plan tests => 4;
 }
 
+
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --lock-wait-timeout=3 else the tool will die.
+my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($master_dsn, qw(--lock-wait-timeout 3));
 my $output;
 my $row;
-my $cnf  ='/tmp/12345/my.sandbox.cnf';
-my @args = (qw(--replicate test.checksum  --empty-replicate-table -d test -t resume -q), '-F', $cnf, 'h=127.1');
-
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-checksum/samples/checksum_tbl.sql');
-# We're not using resume table for anything specific, we just need
-# any table to checksum.
-$sb->load_file('master', 't/pt-table-checksum/samples/resume.sql');
+my $exit_status;
 
 wait_until(  # slaves aren't lagging
    sub {
@@ -56,233 +50,49 @@ wait_until(  # slaves aren't lagging
       $row = $slave2_dbh->selectrow_hashref('show slave status');
       return 0 if $row->{Seconds_Behind_Master};
       return 1;
-   }, 0.5, 10);
+   }
+) or die "Slaves are still lagging";
 
-pt_table_checksum::main(@args);
-
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   1,
-   'Throttle slavelag, no slave lag'
-);
-
-# By default --throttle-method should find all slaves and wait for the most
-# lagged one.  If we stop slave sql_thread on slave2, mk-table-checksum
-# should see this (as undef lag) and wait.  While it's waiting, no
-# checksum should appear in the repl table.
-$slave2_dbh->do('stop slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'No',
-   'Stopped slave SQL thread on slave2'
-);
-
-# wait_for() is going to die() when its alarm goes off, and mk-table-checksum
-# is going to catch this and complain.  We can ignore it.
-{
-   local *STDERR;
-   open  STDERR, ">/dev/null"
-      or die "Cannot redirect STDERR to /dev/null: $OS_ERROR";
-   wait_for(sub { pt_table_checksum::main(@args); }, 2);
-}
-
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   0,
-   'Throttle slavelag waited for slave2'
-);
-
-$slave2_dbh->do('start slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'Yes',
-   'Started slave SQL thread on slave2'
-) or BAIL_OUT("Failed to restart SQL thread on slave2 (12347)");
-
-# Repeat the test but this time re-enable slave2 while mk-table-checksum
-# is waiting and it should checksum the table.
-$slave2_dbh->do('stop slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'No',
-   'Stopped slave SQL thread on slave2'
-);
-
-system("sleep 2 && /tmp/12347/use -e 'start slave sql_thread' >/dev/null 2>/dev/null &");
-
-# This time we do not need to capture STDERR because mk-table-checksum
-# should see slave2 come alive in 2 seconds then return before wait_for
-# dies.
-wait_for(sub { pt_table_checksum::main(@args); }, 5);
-
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   1,
-   'Throttle slavelag waited for slave2 and continue when it was ready'
-);
-
-
-# #############################################################################
+# ############################################################################
 # --check-slave-lag
-# #############################################################################
+# ############################################################################
 
-# Before --throttle-method this stuff was handled by --check-slave-lag which
-# specifies one slave.  Because Ryan flogs me severely when I break
-# backwards compatibility, specifying --check-slave-lag limits --throttle-method
-# to that one slave.  To check this we stop slave sql_thread on slave2
-# and specify slave1.  The checksum should proceed because slave2 should
-# be ignored.
-
-$slave2_dbh->do('stop slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
+$slave1_dbh->do('stop slave sql_thread');
+$row = $slave1_dbh->selectrow_hashref('show slave status');
 is(
    $row->{slave_sql_running},
    'No',
-   'Stopped slave SQL thread on slave2'
+   'Stopped slave SQL thread on slave1'
 );
 
-wait_for(sub { pt_table_checksum::main(@args, qw(--check-slave-lag P=12346)); }, 2);
+$exit_status = pt_table_checksum::main(@args, qw(-t sakila.city --quiet),
+   qw(--no-replicate-check), '--check-slave-lag', 'h=127.1,P=12347');
 
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
+is(
+   $exit_status,
+   0,
+   "Ignores slave1 when --check-slave-lag=slave2"
+);
+
+$row = $master_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='city'");
 is(
    scalar @$row,
    1,
-   'Throttle slavelag checked only --check-slave-lag'
+   "Checksummed table"
 );
 
 # Start slave2 sql_thread and stop slave1 sql_thread and test that
 # mk-table-checksum is really checking and waiting for just --slave-lag-dbh.
-$slave2_dbh->do('start slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'Yes',
-   'Started slave SQL thread on slave2'
-) or BAIL_OUT("Failed to restart SQL thread on slave2 (12347)");
-
-$slave1_dbh->do('stop slave sql_thread');
-$row = $slave1_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'No',
-   'Stopped slave SQL thread on slave1'
-);
-
-{
-   local *STDERR;
-   open  STDERR, ">/dev/null"
-      or die "Cannot redirect STDERR to /dev/null: $OS_ERROR";
-   wait_for(sub { pt_table_checksum::main(@args, qw(--check-slave-lag P=12346)); }, 2);
-}
-
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   0,
-   'Throttle slavelag waited for --check-slave-lag'
-);
-
-
 $slave1_dbh->do('start slave sql_thread');
 $row = $slave1_dbh->selectrow_hashref('show slave status');
 is(
    $row->{slave_sql_running},
    'Yes',
    'Started slave SQL thread on slave1'
-) or BAIL_OUT("Failed to restart SQL thread on slave1 (12346)");
-
-# Clear out all checksum tables before next test where we'll stop slaves
-# and test throttle method "none".
-$master_dbh->do('TRUNCATE TABLE test.checksum');
-sleep 1;
-
-$slave1_dbh->do('stop slave sql_thread');
-$row = $slave1_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'No',
-   'Stopped slave SQL thread on slave1'
-);
-
-# Disable throttle explicitly.
-
-$slave2_dbh->do('stop slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'No',
-   'Stopped slave SQL thread on slave2'
-);
-
-# All slaves are stopped at this point.
-wait_for(sub { pt_table_checksum::main(@args, qw(--throttle-method none)) }, 2);
-
-$row = $master_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   1,
-   'Throttle none'
-);
-
-$row = $slave1_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   0,
-   'No checksum replicated to slave1 yet'
-);
-
-$row = $slave2_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   0,
-   'No checksum replicated to slave2 yet'
-);
-
-
-$slave1_dbh->do('start slave sql_thread');
-$row = $slave1_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'Yes',
-   'Started slave SQL thread on slave1'
-) or BAIL_OUT("Failed to restart SQL thread on slave1 (12346)");
-
-$slave2_dbh->do('start slave sql_thread');
-$row = $slave2_dbh->selectrow_hashref('show slave status');
-is(
-   $row->{slave_sql_running},
-   'Yes',
-   'Started slave SQL thread on slave2'
 ) or BAIL_OUT("Failed to restart SQL thread on slave2 (12347)");
 
-sleep 1;
-
-$row = $slave1_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   1,
-   'Checksum replicated to slave1'
-);
-
-$row = $slave2_dbh->selectall_arrayref('select * from test.checksum');
-is(
-   scalar @$row,
-   1,
-   'Checksum replicated to slave2'
-);
-
 # #############################################################################
 # Done.
 # #############################################################################
-diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
-diag(`/tmp/12346/stop >/dev/null`);  # Start/stop clears SHOW SLAVE HOSTS.
-diag(`/tmp/12346/start >/dev/null`);
 $sb->wipe_clean($master_dbh);
-diag(`$trunk/sandbox/test-env reset >/dev/null`);
 exit;