diff --git a/mysql-test/include/have_unix_socket.inc b/mysql-test/include/have_unix_socket.inc
new file mode 100644
index 00000000000..6e4c3b9826b
--- /dev/null
+++ b/mysql-test/include/have_unix_socket.inc
@@ -0,0 +1,10 @@
+--source include/not_embedded.inc
+
+if (!$AUTH_SOCKET_SO) {
+  skip No unix_socket plugin;
+}
+
+if (!$USER) {
+  skip USER variable is undefined;
+}
+
diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test
index fc2e6c5b3c6..3ce1d0323fb 100644
--- a/mysql-test/suite/plugins/t/unix_socket.test
+++ b/mysql-test/suite/plugins/t/unix_socket.test
@@ -1,8 +1,4 @@
---source include/not_embedded.inc
-
-if (!$AUTH_SOCKET_SO) {
-  skip No auth_socket plugin;
-}
+--source include/have_unix_socket.inc
 
 let $plugindir=`SELECT @@global.plugin_dir`;