diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7012fe27126..75c420c0fbb 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2051,6 +2051,13 @@ sub environment_setup {
       push(@ld_library_paths, "$basedir/libmysql/.libs/",
 	   "$basedir/libmysql_r/.libs/",
 	   "$basedir/zlib/.libs/");
+      if ($^O eq "darwin")
+      {
+        # it is MAC OS and we have to add dynamic libraries paths
+        push @ld_library_paths, grep {<$_/*.dylib>} 
+          (<$bindir/storage/*/.libs/>,<$bindir/plugin/*/.libs/>,
+          <$bindir/plugin/*/*/.libs/>,<$bindir/storage/*/*/.libs>);
+      }
     }
     else
     {
diff --git a/plugin/handler_socket/libhsclient/Makefile.am b/plugin/handler_socket/libhsclient/Makefile.am
index 996ef34b121..343b41860b3 100644
--- a/plugin/handler_socket/libhsclient/Makefile.am
+++ b/plugin/handler_socket/libhsclient/Makefile.am
@@ -8,6 +8,5 @@ inst_HEADERS = allocator.hpp config.hpp mutex.hpp string_util.hpp \
 lib_LTLIBRARIES = libhsclient.la
 libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \
 	socket.cpp string_util.cpp
-libhsclient_la_LDFLAGS = -static
 libhsclient_la_CFLAGS = $(AM_CFLAGS) 
 libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS)