diff --git a/mysql-test/t/auth_rpl-master.opt b/mysql-test/include/have_plugin_auth.opt
similarity index 100%
rename from mysql-test/t/auth_rpl-master.opt
rename to mysql-test/include/have_plugin_auth.opt
diff --git a/mysql-test/t/auth_rpl-slave.opt b/mysql-test/t/auth_rpl-slave.opt
index ca6eee95ded..1e471f65645 100644
--- a/mysql-test/t/auth_rpl-slave.opt
+++ b/mysql-test/t/auth_rpl-slave.opt
@@ -1,2 +1 @@
 --master-retry-count=1
---plugin-load=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt
index d2db22b8634..69debb24dae 100644
--- a/mysql-test/t/mysql_client_test-master.opt
+++ b/mysql-test/t/mysql_client_test-master.opt
@@ -1,3 +1,2 @@
 --log=$MYSQLTEST_VARDIR/log/master.log 
 --log-output=FILE,TABLE
---plugin-load=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/t/plugin_auth-master.opt b/mysql-test/t/plugin_auth-master.opt
deleted file mode 100644
index ff91abb1bef..00000000000
--- a/mysql-test/t/plugin_auth-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-load=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/t/plugin_auth_qa-master.opt b/mysql-test/t/plugin_auth_qa-master.opt
deleted file mode 100644
index ff91abb1bef..00000000000
--- a/mysql-test/t/plugin_auth_qa-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-load=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/t/plugin_auth_qa_1-master.opt b/mysql-test/t/plugin_auth_qa_1-master.opt
deleted file mode 100644
index ff91abb1bef..00000000000
--- a/mysql-test/t/plugin_auth_qa_1-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-load=$AUTH_TEST_PLUGIN_SO