diff --git a/Makefile b/Makefile
index 18650faf7..c0d2a96de 100644
--- a/Makefile
+++ b/Makefile
@@ -65,10 +65,10 @@ check: debug launch_test_clients run_test_debug kill_test_clients
 check_release: release launch_test_clients run_test_release kill_test_clients
 
 run_test_debug:
-	@-LD_LIBRARY_PATH=$(INSTALL_FOLDER)/lib $(INSTALL_FOLDER)/bin/test_carlaserverd --gtest_shuffle
+	@-LD_LIBRARY_PATH=$(INSTALL_FOLDER)/shared $(INSTALL_FOLDER)/bin/test_carlaserverd --gtest_shuffle
 
 run_test_release:
-	@-LD_LIBRARY_PATH=$(INSTALL_FOLDER)/lib $(INSTALL_FOLDER)/bin/test_carlaserver --gtest_shuffle
+	@-LD_LIBRARY_PATH=$(INSTALL_FOLDER)/shared $(INSTALL_FOLDER)/bin/test_carlaserver --gtest_shuffle
 
 launch_test_clients:
 	@echo "Launch echo_client.py"
diff --git a/Util/cmake/CarlaServer/CMakeLists.txt b/Util/cmake/CarlaServer/CMakeLists.txt
index cf3b6c735..b66eafa80 100644
--- a/Util/cmake/CarlaServer/CMakeLists.txt
+++ b/Util/cmake/CarlaServer/CMakeLists.txt
@@ -33,6 +33,7 @@ if (UNIX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
   include_directories("${CARLA_LIBCXX_INSTALL_PATH}/include/c++/v1")
   link_directories("${CARLA_LIBCXX_INSTALL_PATH}/lib")
+  file(GLOB LibCXX_Shared_Libraries "${CARLA_LIBCXX_INSTALL_PATH}/lib/libc++*.so*")
   file(GLOB LibCXX_Static_Libraries "${CARLA_LIBCXX_INSTALL_PATH}/lib/libc++*.a")
 
   # Setup boost.
@@ -47,6 +48,10 @@ if (UNIX)
   include_directories("${CARLA_GOOGLETEST_INSTALL_PATH}/include")
   set(GTest_Static_Libraries "${CARLA_GOOGLETEST_INSTALL_PATH}/lib/libgtest.a")
 
+  install(FILES
+      ${LibCXX_Shared_Libraries}
+    DESTINATION shared)
+
   install(FILES
       ${LibCXX_Static_Libraries}
       ${Boost_Static_Libraries}