diff --git a/t/pt-show-grants/basics.t b/t/pt-show-grants/basics.t
index 475e58af..64bcdc48 100644
--- a/t/pt-show-grants/basics.t
+++ b/t/pt-show-grants/basics.t
@@ -84,7 +84,7 @@ unlike(
 );
 
 $output = output(
-   sub { pt_show_grants::main('-F', $cnf, '--ignore', 'baron,msandbox,root,root@localhost,user,mysql.session@localhost,mysql.sys@localhost,sys,mysql.infoschema@localhost'); }
+   sub { pt_show_grants::main('-F', $cnf, '--ignore', 'baron,msandbox,root,root@localhost,user,mysql.session@localhost,mysql.sys@localhost,sys,mysql.infoschema@localhost,percona.telemetry@localhost'); }
 );
 unlike(
    $output,
diff --git a/t/pt-table-checksum/samples/default-results-8.0.txt b/t/pt-table-checksum/samples/default-results-8.0.txt
index 019a094f..3508845a 100644
--- a/t/pt-table-checksum/samples/default-results-8.0.txt
+++ b/t/pt-table-checksum/samples/default-results-8.0.txt
@@ -28,7 +28,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
 0 0 0 0 mysql.time_zone_name
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
-0 1 5 0 mysql.user
+0 1 6 0 mysql.user
 0 0 29 0 percona_test.checksums
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor
diff --git a/t/pt-table-checksum/samples/default-results-8.4.txt b/t/pt-table-checksum/samples/default-results-8.4.txt
index b6ab161b..2905fea4 100644
--- a/t/pt-table-checksum/samples/default-results-8.4.txt
+++ b/t/pt-table-checksum/samples/default-results-8.4.txt
@@ -28,7 +28,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
 0 0 0 0 mysql.time_zone_name
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
-0 1 5 0 mysql.user
+0 1 6 0 mysql.user
 0 0 29 0 percona_test.checksums
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor
diff --git a/t/pt-table-sync/filters.t b/t/pt-table-sync/filters.t
index 5928aa53..b1106d2f 100644
--- a/t/pt-table-sync/filters.t
+++ b/t/pt-table-sync/filters.t
@@ -147,7 +147,7 @@ foreach my $args (
    my $stm = $args->[-1] eq '--sync-to-source' ? ' --sync-to-source' : '';
 
    test_filters(
-      name => $stm . "--replicate --tables t1",
+      name => $stm . " --replicate --tables t1",
       cmds => [@$args,
                qw(--tables t1)],
       res  => [qw(d1.t1 d2.t1 percona.checksums)],
diff --git a/t/pt-upgrade/diff_rows.t b/t/pt-upgrade/diff_rows.t
index 5d13256b..0d6c725c 100644
--- a/t/pt-upgrade/diff_rows.t
+++ b/t/pt-upgrade/diff_rows.t
@@ -104,12 +104,12 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
                [
                  2,
                  [ 'mysql.infoschema' ],
-                 [ 'mysql.sys' ]
+                 [ 'percona.telemetry' ]
                ],
                [
-                 4,
-                 [ 'mysql.sys' ],
-                 [ 'mysql.infoschema' ]
+                 3,
+                 [ 'mysql.session' ],
+                 [ 'mysql.sys' ]
                ]
              ]; 
 }
@@ -146,7 +146,7 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
 } elsif ($sandbox_version ge '8.0') {
     $expect =[
               [
-                4,
+                5,
                 undef,
                 [
                   [ 'mysql.infoschema' ],
@@ -189,7 +189,7 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
 } elsif ($sandbox_version ge '8.0') {
     $expect =[
                [
-                 4,
+                 5,
                  [
                    [
                      'mysql.infoschema'