diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c4761122e35f89b398dc96b0196e43ee838dc907..2d42842d1dfe2824f0cfa994cd5e1347a5649a4c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -22,6 +22,7 @@ TARGET_LINK_LIBRARIES(testrunner
 	BaseLib
 	GeoLib
 	${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
 )
 
 # Add make-target test which runs the testrunner
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index faa25cc72415cfbd039e7f49f90569cf114e9aae..aa433404e0c9e2d68447048adab1a2cfed3b17b8 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -50,7 +50,7 @@ IF (COMPILER_IS_INTEL)
 				MESSAGE(STATUS "Set Intel release flags")
 				SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
 		ENDIF()
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHOST -O3 -no-prec-div -static -DNDEBUG")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHOST -O3 -no-prec-div -DNDEBUG")
 ENDIF() # COMPILER_IS_INTEL
 
 # Profiling