diff --git a/mysql-test/include/linux.inc b/mysql-test/include/linux.inc
index f24832ca476..cc126ff1d73 100644
--- a/mysql-test/include/linux.inc
+++ b/mysql-test/include/linux.inc
@@ -1,4 +1,4 @@
-if (`select convert(@@version_compile_os using latin1) LIKE 'Linux' = 0`)
+if (`select @@version_compile_os not LIKE 'Linux%'`)
 {
   skip Need Linux;
 }
diff --git a/mysql-test/main/no-threads-master.opt b/mysql-test/main/no-threads.opt
similarity index 100%
rename from mysql-test/main/no-threads-master.opt
rename to mysql-test/main/no-threads.opt
diff --git a/mysql-test/main/no-threads.test b/mysql-test/main/no-threads.test
index c1a608a57e6..8235ff67284 100644
--- a/mysql-test/main/no-threads.test
+++ b/mysql-test/main/no-threads.test
@@ -2,7 +2,6 @@
 # an additional util connection and other statistics data
 -- source include/no_view_protocol.inc
 
---source include/one_thread_per_connection.inc
 #
 # Test the --thread-handler=no-threads option
 #
diff --git a/mysql-test/suite/plugins/t/show_all_plugins.test b/mysql-test/suite/plugins/t/show_all_plugins.test
index 77723d32170..171bcc93bbd 100644
--- a/mysql-test/suite/plugins/t/show_all_plugins.test
+++ b/mysql-test/suite/plugins/t/show_all_plugins.test
@@ -1,7 +1,7 @@
+--source include/have_udf.inc
 if (!$DIALOG_EXAMPLES_SO) { skip requires dialog_examples.so; }
 if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; }
 if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; }
-if (!$UDF_EXAMPLE_SO) { skip requires udf_example.so; }
 if (!$EXAMPLE_KEY_MANAGEMENT_SO) { skip requires example_key_management.so; }
 if (`SELECT VERSION() LIKE '%embedded%'`) { skip Disabled for embedded until MDEV-8664 is resolved; }