diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 4b82f184cfdda920477c0ef9a5741609427d383f..f72ff18f20614cac7468717a85f16f5bba5ec1bf 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -12,6 +12,5 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES( BaseLib
-	${Boost_FILESYSTEM_LIBRARY}
-	${Boost_SYSTEM_LIBRARY}
+	${Boost_LIBRARIES}
 )
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 017a2dd9389009a5f67204f9dc2877607afb0ead..395c380c2a90fc153fe1a7c426244cd6ca6acda7 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -27,8 +27,7 @@ TARGET_LINK_LIBRARIES ( MeshRead
 	logog
 	zlib
 	${ADDITIONAL_LIBS}
-	${Boost_FILESYSTEM_LIBRARY}
-	${Boost_SYSTEM_LIBRARY}
+	${Boost_LIBRARIES}
 )
 
 # Create CollapseMeshNodes executable
@@ -45,8 +44,7 @@ TARGET_LINK_LIBRARIES ( CollapseMeshNodes
 	BaseLib
 	GeoLib
 	logog
-	${Boost_FILESYSTEM_LIBRARY}
-	${Boost_SYSTEM_LIBRARY}
+	${Boost_LIBRARIES}
 )
 
 # Create MeshSearchTest executable
@@ -64,6 +62,5 @@ TARGET_LINK_LIBRARIES ( MeshSearchTest
 	GeoLib
 	logog
 	${ADDITIONAL_LIBS}
-	${Boost_FILESYSTEM_LIBRARY}
-	${Boost_SYSTEM_LIBRARY}
+	${Boost_LIBRARIES}
 )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7f63037318f5f6cbb588419890ccceb43777afaf..d9245f5b849e0384c00db5570691030cfb1a1e0b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -41,8 +41,7 @@ TARGET_LINK_LIBRARIES(testrunner
 	MeshLib
 	OgsLib
 	logog
-	${Boost_FILESYSTEM_LIBRARY}
-	${Boost_SYSTEM_LIBRARY}
+	${Boost_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT}
 )