diff --git a/.travis.yml b/.travis.yml
index 78636af..b7cec28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ install:
 before_script:
   - mkdir build.ci
   - cd build.ci
-  - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG
+  - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES 
 
 script:
   - cmake --build .
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48582a1..e825a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,10 +35,18 @@ include_directories(${PROJECT_WIDE_INCLUDE})
 
 # TODO: need to handle this with option
 set(Boost_USE_MULTITHREADED ON)
-# set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 
-find_package(Boost 1.40 COMPONENTS unit_test_framework REQUIRED)
+set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST})
+set(Boost_USE_MULTITHREADED ON)
+unset(Boost_INCLUDE_DIR CACHE)
+unset(Boost_LIBRARY_DIRS CACHE)
+find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+if(USE_STATIC_BOOST)
+   message(STATUS "Linking against boost static libraries")
+else(USE_STATIC_BOOST)
+   message(STATUS "Linking against boost dynamic libraries")
+endif(USE_STATIC_BOOST)
 
     # disable autolinking feature
 add_definitions(-DBOOST_ALL_NO_LIB)
diff --git a/appveyor.yml b/appveyor.yml
index 9d5d87c..f6eaa8d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
 build_script: 
   - mkdir build 
   - cd build 
-  - cmake -G "Visual Studio 14 2015 Win64" ..
+  - cmake -G "Visual Studio 14 2015 Win64" -DUSE_STATIC_BOOST=NO  ..
   - cmake --build . --config Debug
 
 test_script: