diff --git a/mysql-test/suite/perfschema/r/sxlock_func.result b/mysql-test/suite/perfschema/r/sxlock_func.result
index 66055922e87..d54414f18fe 100644
--- a/mysql-test/suite/perfschema/r/sxlock_func.result
+++ b/mysql-test/suite/perfschema/r/sxlock_func.result
@@ -1,6 +1,14 @@
 UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name like 'wait/synch/sxlock/%';
+SELECT DISTINCT name FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/rwlock/innodb%'
+AND name!='wait/synch/rwlock/innodb/btr_search_latch' ORDER BY name;
+name
+wait/synch/rwlock/innodb/dict_operation_lock
+wait/synch/rwlock/innodb/fil_space_latch
+wait/synch/rwlock/innodb/trx_i_s_cache_lock
+wait/synch/rwlock/innodb/trx_purge_latch
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
@@ -8,18 +16,11 @@ select name from performance_schema.setup_instruments
 where name like "wait/synch/sxlock/%" order by name;
 name
 wait/synch/sxlock/innodb/index_tree_rw_lock
-select name from performance_schema.rwlock_instances
-where name in
-(
-'wait/synch/sxlock/innodb/btr_search_latch',
-'wait/synch/sxlock/innodb/checkpoint_lock',
-'wait/synch/sxlock/innodb/dict_operation_lock',
-'wait/synch/sxlock/innodb/trx_i_s_cache_lock',
-'wait/synch/sxlock/innodb/trx_purge_latch'
-  )
-order by name;
+SELECT DISTINCT name FROM performance_schema.rwlock_instances
+WHERE name LIKE 'wait/synch/sxlock/innodb/%'
+ORDER BY name;
 name
-drop table if exists t1;
+wait/synch/sxlock/innodb/index_tree_rw_lock
 create table t1(a int) engine=innodb;
 begin;
 insert into t1 values (1), (2), (3);
diff --git a/mysql-test/suite/perfschema/t/sxlock_func.test b/mysql-test/suite/perfschema/t/sxlock_func.test
index f5f38f51c78..55a272d80ac 100644
--- a/mysql-test/suite/perfschema/t/sxlock_func.test
+++ b/mysql-test/suite/perfschema/t/sxlock_func.test
@@ -11,6 +11,10 @@ UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name like 'wait/synch/sxlock/%';
 
+SELECT DISTINCT name FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/rwlock/innodb%'
+AND name!='wait/synch/rwlock/innodb/btr_search_latch' ORDER BY name;
+
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
@@ -20,23 +24,12 @@ select name from performance_schema.setup_instruments
 where name like "wait/synch/sxlock/%" order by name;
 
 # Check some SX-locks instances are instrumented
-select name from performance_schema.rwlock_instances
-  where name in
-  (
-    'wait/synch/sxlock/innodb/btr_search_latch',
-    'wait/synch/sxlock/innodb/checkpoint_lock',
-    'wait/synch/sxlock/innodb/dict_operation_lock',
-    'wait/synch/sxlock/innodb/trx_i_s_cache_lock',
-    'wait/synch/sxlock/innodb/trx_purge_latch'
-  )
-  order by name;
+SELECT DISTINCT name FROM performance_schema.rwlock_instances
+WHERE name LIKE 'wait/synch/sxlock/innodb/%'
+ORDER BY name;
 
 # Some Innodb payload, to produce data
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
-
 create table t1(a int) engine=innodb;
 begin;
 insert into t1 values (1), (2), (3);