diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt
index fb60887cf6b78e74f64a71395192bdcdee5c8dfd..ba46ee1335c3e72e769399c134751f63762eb1bc 100644
--- a/VirtualRobot/CMakeLists.txt
+++ b/VirtualRobot/CMakeLists.txt
@@ -25,7 +25,9 @@ endif()
     INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
     INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/..")
     ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
-    ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK) 
+    if (NOT Boost_USE_STATIC_LIBS)
+        ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
+    endif (NOT Boost_USE_STATIC_LIBS)
     ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
     TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot ${Simox_EXTERNAL_LIBRARIES} ${Boost_TEST_LIB})
     SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
diff --git a/VirtualRobot/VirtualRobotTest.h b/VirtualRobot/VirtualRobotTest.h
index 29a478853b0114cef12221e5ada6af5b60554940..654046559a948d39463914a9f9c67b4333717520 100644
--- a/VirtualRobot/VirtualRobotTest.h
+++ b/VirtualRobot/VirtualRobotTest.h
@@ -23,10 +23,6 @@
 #ifndef _VirtualRobot_Test_h_
 #define _VirtualRobot_Test_h_
 
-#ifndef BOOST_TEST_DYN_LINK
-#define BOOST_TEST_DYN_LINK
-#endif
-
 #include <boost/test/unit_test.hpp>
 
 #include "VirtualRobot.h"
diff --git a/config.cmake b/config.cmake
index 4b8c9d89162f9d61a9db7597b2416d5789419602..f17c216fef36b014bb21313b3faca19b7b1ae49c 100644
--- a/config.cmake
+++ b/config.cmake
@@ -178,8 +178,13 @@ IF (NOT Simox_CONFIGURED)
         SET (Simox_EXTERNAL_LIBRARIES ${Simox_EXTERNAL_LIBRARIES} ${Boost_LIBRARIES})
         FIND_PACKAGE(Boost 1.46.0 COMPONENTS unit_test_framework REQUIRED)
         SET (Boost_TEST_LIB "${Boost_LIBRARIES}")
-        # disable boost auto linking
-        SET (Simox_EXTERNAL_LIBRARY_FLAGS "${Simox_EXTERNAL_LIBRARY_FLAGS} -DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK")
+        # disable boost auto linking 
+        if (Boost_USE_STATIC_LIBS)
+            SET (Simox_EXTERNAL_LIBRARY_FLAGS "${Simox_EXTERNAL_LIBRARY_FLAGS} -DBOOST_ALL_NO_LIB -DBOOST_TEST_MAIN")
+        else (Boost_USE_STATIC_LIBS)
+            # enable dynamic linking for specific boost libraries
+            SET (Simox_EXTERNAL_LIBRARY_FLAGS "${Simox_EXTERNAL_LIBRARY_FLAGS} -DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK")
+        endif (Boost_USE_STATIC_LIBS)
     else (Boost_FOUND)
         MESSAGE ("!! Could not find Boost !!")
     endif (Boost_FOUND)