diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result
index 7cbe91b3753cf447f0bd6b703ad290faf9dc6e87..fc49469ae742b1cb3d496a4a394393b5cd1a397b 100644
--- a/mysql-test/r/not_embedded_server.result
+++ b/mysql-test/r/not_embedded_server.result
@@ -1,6 +1,6 @@
-prepare stmt1 from ' show full processlist ';
+prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' ';
 execute stmt1;
-Id	User	Host	db	Command	Time	State	Info
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+number	root	localhost	test	Query	time	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon'
 number	event_scheduler	localhost	NULL	Connect	time	Suspended	NULL
-number	root	localhost	test	Query	time	NULL	show full processlist
 deallocate prepare stmt1;
diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test
index 83ec03d6706cb765cd93e95faf185ff0df8159a3..5beee5967a3e6a0c1c3f0a433571e9ff27dd7121 100644
--- a/mysql-test/t/not_embedded_server.test
+++ b/mysql-test/t/not_embedded_server.test
@@ -9,10 +9,15 @@
 # To not show other connections, this must be the first test and we must
 # have a server restart before this one
 #
+# We don't have any 4.1 tests as we use I_S to query the PROCESSLIST to
+# exclude system threads that may/may not be active in the server
+# (namely the ndb injector thread)
+#
+# End of 4.1 tests
 
-prepare stmt1 from ' show full processlist ';
+prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' ';
 --replace_column 1 number 6 time 3 localhost
 execute stmt1;
 deallocate prepare stmt1;
 
-# End of 4.1 tests
+# End of 5.1 tests