diff --git a/CMakeLists.txt b/CMakeLists.txt
index c72a6f295..25ca8d9e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ endif()
 if(CYGWIN OR MSVC OR WIN32)
   set(Boost_USE_STATIC_LIBS 1)
 endif()
-find_package(Boost 1.42 COMPONENTS serialization system filesystem thread REQUIRED)
+find_package(Boost 1.42 COMPONENTS serialization REQUIRED)
 
 # General build settings
 include_directories(
diff --git a/wrap/CMakeLists.txt b/wrap/CMakeLists.txt
index 4972e1ee2..16dfbb8e5 100644
--- a/wrap/CMakeLists.txt
+++ b/wrap/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Build/install Wrap
 
+find_package(Boost 1.42 COMPONENTS system filesystem thread REQUIRED)
+
 # Build the executable itself
 file(GLOB wrap_srcs "*.cpp")
 list(REMOVE_ITEM wrap_srcs wrap.cpp)
@@ -18,7 +20,7 @@ install(FILES matlab.h DESTINATION include/wrap)
 # Build tests
 if (GTSAM_BUILD_TESTS) 
     add_definitions(-DTOPSRCDIR="${CMAKE_SOURCE_DIR}")
-    set(wrap_local_libs wrap_lib) 
+    set(wrap_local_libs wrap_lib ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}) 
     gtsam_add_subdir_tests("wrap" "${wrap_local_libs}" "${wrap_local_libs}" "") 
 endif(GTSAM_BUILD_TESTS)