diff --git a/mysql-test/r/old-mode.result b/mysql-test/r/old-mode.result
index a27b637d6e3..eec08d4d5c8 100644
--- a/mysql-test/r/old-mode.result
+++ b/mysql-test/r/old-mode.result
@@ -18,4 +18,4 @@ test.t2	2948697075
 drop table t1,t2;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	<Host>	test	Query	<Time>	init	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW PROCESSLIST
diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
index 61749784d46..d54656c9a3f 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
@@ -152,7 +152,6 @@ def	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci
 def	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)				
 def	mysql	slave_master_info	Bind	18	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				Displays which interface is employed when connecting to the MySQL server
 def	mysql	slave_master_info	Connect_retry	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				The period (in seconds) that the slave will wait before trying to reconnect to the master.
-def	mysql	slave_master_info	Enabled_auto_position	24	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)				Indicates whether GTIDs will be used to retrieve events from the master.
 def	mysql	slave_master_info	Enabled_ssl	10	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)				Indicates whether the server supports SSL connections.
 def	mysql	slave_master_info	Heartbeat	17	NULL	NO	float	NULL	NULL	12	NULL	NULL	NULL	NULL	float				
 def	mysql	slave_master_info	Host	5	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The host name of the master.
@@ -512,7 +511,6 @@ NULL	mysql	slave_master_info	Heartbeat	float	NULL	NULL	NULL	NULL	float
 NULL	mysql	slave_master_info	Retry_count	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 1.0000	mysql	slave_master_info	Ssl_crl	text	65535	65535	utf8	utf8_bin	text
 1.0000	mysql	slave_master_info	Ssl_crlpath	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Enabled_auto_position	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 NULL	mysql	slave_relay_log_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	slave_relay_log_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int(10) unsigned
 1.0000	mysql	slave_relay_log_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text
diff --git a/mysql-test/t/old-mode.test b/mysql-test/t/old-mode.test
index cf2167c8027..182c166ebbc 100644
--- a/mysql-test/t/old-mode.test
+++ b/mysql-test/t/old-mode.test
@@ -20,7 +20,7 @@ drop table t1,t2;
 # Test that SHOW PROCESSLIST doesn't have the Progress column
 #
 
---replace_column 1 <Id> 3 <Host> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 # Embedded server is hardcoded to show "Writing to net" as STATE.
 --replace_result "Writing to net" "NULL"
 --replace_regex /localhost[:0-9]*/localhost/
diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
index a07d0eb7d02..27cffdce1f2 100644
--- a/mysql-test/t/ssl_8k_key.test
+++ b/mysql-test/t/ssl_8k_key.test
@@ -1,3 +1,6 @@
+# This test should work in embedded server after we fix mysqltest
+-- source include/not_embedded.inc
+
 -- source include/have_ssl_communication.inc
 #
 # Bug#29784 YaSSL assertion failure when reading 8k key.