diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result
index c402f02b85914..c1d2ee54c0f80 100644
--- a/mysql-test/main/ssl.result
+++ b/mysql-test/main/ssl.result
@@ -1,5 +1,5 @@
 connect  ssl_con,localhost,root,,,,,SSL;
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 variable_name
 Ssl_cipher
 Ssl_cipher_list
diff --git a/mysql-test/main/ssl.test b/mysql-test/main/ssl.test
index 53d93ff15933c..83bae7bde04cc 100644
--- a/mysql-test/main/ssl.test
+++ b/mysql-test/main/ssl.test
@@ -12,9 +12,12 @@
 --source include/default_charset.inc
 --source include/have_perfschema.inc
 
+let $default_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+
 connect (ssl_con,localhost,root,,,,,SSL);
 
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+let $ssl_con_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+evalp select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 
 # Check ssl turned on
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';