diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 30abdcbcf72..7012fe27126 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2444,7 +2444,7 @@ sub setup_vardir() {
     }
     else
     {
-      for (<$bindir/storage/*/.libs/*.so>,<$bindir/plugin/*/.libs/*.so>,<$bindir/sql/.libs/*.so>)
+      for (<$bindir/storage/*/.libs/*.so>,<$bindir/plugin/*/.libs/*.so>,<$bindir/plugin/*/*/.libs/*.so>,<$bindir/sql/.libs/*.so>)
       {
         my $pname=basename($_);
         symlink rel2abs($_), "$plugindir/$pname";
diff --git a/mysql-test/r/handlersocket.result b/mysql-test/r/handlersocket.result
new file mode 100644
index 00000000000..dcea3c186b6
--- /dev/null
+++ b/mysql-test/r/handlersocket.result
@@ -0,0 +1,13 @@
+install plugin handlersocket soname 'handlersocket.so';
+select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
+plugin_name	handlersocket
+plugin_version	1.0
+plugin_status	ACTIVE
+plugin_type	DAEMON
+plugin_library	handlersocket.so
+plugin_library_version	0.0
+plugin_author	higuchi dot akira at dena dot jp
+plugin_license	
+plugin_maturity	Unknown
+plugin_auth_version	Unknown
+uninstall plugin handlersocket;
diff --git a/mysql-test/t/handlersocket.test b/mysql-test/t/handlersocket.test
new file mode 100644
index 00000000000..3d6499d3af5
--- /dev/null
+++ b/mysql-test/t/handlersocket.test
@@ -0,0 +1,11 @@
+--source include/have_dynamic_loading.inc
+--source include/not_windows_embedded.inc
+
+if (`select length('$HANDLERSOCKET_SO') = 0`) {
+  skip handlersocket plugin is not built;
+}
+
+install plugin handlersocket soname 'handlersocket.so';
+--query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
+uninstall plugin handlersocket;
+
diff --git a/plugin/handler_socket/handlersocket/Makefile.am b/plugin/handler_socket/handlersocket/Makefile.am
index e00b7bc4ea4..4d75d9739b1 100644
--- a/plugin/handler_socket/handlersocket/Makefile.am
+++ b/plugin/handler_socket/handlersocket/Makefile.am
@@ -1,7 +1,8 @@
 pkgplugindir =  $(PLUGIN_DIR)
+CXXFLAGS += -fimplicit-templates
 noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp
 pkgplugin_LTLIBRARIES = handlersocket.la
 handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la
-handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient
+handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient
 handlersocket_la_SOURCES = database.cpp handlersocket.cpp \
 	hstcpsvr_worker.cpp hstcpsvr.cpp