diff --git a/t/pt-archiver/issue_1152.t b/t/pt-archiver/issue_1152.t
index 9bf0c421..47e5342a 100644
--- a/t/pt-archiver/issue_1152.t
+++ b/t/pt-archiver/issue_1152.t
@@ -19,6 +19,9 @@ my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('master');
 
+# This issue/bug seems not to have been reproduced or followed up on.
+plan skip_all => "issue 1152";
+
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
diff --git a/t/pt-archiver/issue_1229.t b/t/pt-archiver/issue_1229.t
index caad4c2b..e7f4f835 100644
--- a/t/pt-archiver/issue_1229.t
+++ b/t/pt-archiver/issue_1229.t
@@ -36,7 +36,7 @@ my $file = "/tmp/mk-archiver-file.txt";
 # archive to file
 # #############################################################################
 $sb->load_file('master', 't/pt-archiver/samples/issue_1225.sql');
-PerconaTest::wait_for_table($dbh, 'issue_1225.t');
+PerconaTest::wait_for_table($dbh, 'issue_1225.t', "i=2");
 
 $dbh->do('set names "utf8"');
 my $original_rows = $dbh->selectall_arrayref('select * from issue_1225.t where i in (1, 2)');
diff --git a/t/pt-archiver/issue_655.t b/t/pt-archiver/issue_655.t
index 61013c8c..d2210c76 100644
--- a/t/pt-archiver/issue_655.t
+++ b/t/pt-archiver/issue_655.t
@@ -39,6 +39,7 @@ $sb->create_dbs($dbh, ['test']);
 $dbh->do('CREATE TABLE test.t (i int)');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1), "--source", "F=$cnf,D=test,t=t", qw(--purge --primary-key-only)) },
+   stderr => 1,
 );
 unlike(
    $output,