diff --git a/.travis.yml b/.travis.yml
index a36a7ba..f58183b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
     - env: LIB=wave
 
 install:
-  - BOOST_BRANCH=feature/cmake-config
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..
   - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
diff --git a/appveyor.yml b/appveyor.yml
index 892e496..bfd30a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,8 @@ environment:
   - LIB: wave
 
 install:
-  - set BOOST_BRANCH=feature/cmake-config
+  - set BOOST_BRANCH=develop
+  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
   - cd ..
   - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root