diff --git a/.travis.yml b/.travis.yml
index 16cb4ef..c589d61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -311,9 +311,29 @@ install:
   - cd boost-root
   - git submodule update --init tools/build
   - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
+  - git submodule update --init libs/core
+  - git submodule update --init libs/detail
+  - git submodule update --init libs/assert
+  - git submodule update --init libs/static_assert
+  - git submodule update --init libs/type_traits
+  - git submodule update --init libs/mpl
+  - git submodule update --init libs/preprocessor
+  - git submodule update --init libs/multiprecision
+  - git submodule update --init libs/math
+  - git submodule update --init libs/rational
+  - git submodule update --init libs/throw_exception
+  - git submodule update --init libs/predef
+  - git submodule update --init libs/lexical_cast
+  - git submodule update --init libs/range
+  - git submodule update --init libs/iterator
+  - git submodule update --init libs/concept_check
+  - git submodule update --init libs/numeric
+  - git submodule update --init libs/array
+  - git submodule update --init libs/container
+  - git submodule update --init libs/move
+  - git submodule update --init libs/functional
+  - git submodule update --init libs/random
   - cp -r $TRAVIS_BUILD_DIR/* libs/integer
-  - python tools/boostdep/depinst/depinst.py integer
   - ./bootstrap.sh
   - ./b2 headers
 
diff --git a/appveyor.yml b/appveyor.yml
index 1f4b748..17922c5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,19 +11,72 @@ branches:
     - master
     - develop
 
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ARGS: --toolset=msvc-9.0  address-model=32
+    - ARGS: --toolset=msvc-10.0 address-model=32
+    - ARGS: --toolset=msvc-11.0 address-model=32
+    - ARGS: --toolset=msvc-12.0 address-model=32
+    - ARGS: --toolset=msvc-14.0 address-model=32
+    - ARGS: --toolset=msvc-12.0 address-model=64
+    - ARGS: --toolset=msvc-14.0 address-model=64
+    - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=32
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
+    - ARGS: --toolset=gcc address-model=64
+      PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
+    - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
+      PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
+    - ARGS: --toolset=gcc address-model=32
+      PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
+    - ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition
+      PATH: C:\MinGW\bin;%PATH%
+
+
 install:
   - cd ..
   - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
   - git submodule update --init tools/build
   - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
+  - git submodule update --init libs/core
+  - git submodule update --init libs/detail
+  - git submodule update --init libs/assert
+  - git submodule update --init libs/static_assert
+  - git submodule update --init libs/type_traits
+  - git submodule update --init libs/mpl
+  - git submodule update --init libs/preprocessor
+  - git submodule update --init libs/multiprecision
+  - git submodule update --init libs/math
+  - git submodule update --init libs/rational
+  - git submodule update --init libs/throw_exception
+  - git submodule update --init libs/predef
+  - git submodule update --init libs/lexical_cast
+  - git submodule update --init libs/range
+  - git submodule update --init libs/iterator
+  - git submodule update --init libs/concept_check
+  - git submodule update --init libs/numeric
+  - git submodule update --init libs/array
+  - git submodule update --init libs/container
+  - git submodule update --init libs/move
+  - git submodule update --init libs/functional
+  - git submodule update --init libs/random
   - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\integer
-  - python tools/boostdep/depinst/depinst.py integer
   - bootstrap
   - b2 headers
 
 build: off
 
 test_script:
-  - b2 libs/integer/test toolset=msvc-9.0,msvc-10.0,msvc-11.0,msvc-14.0
+  - cd libs\config\test
+  - ..\..\..\b2 config_info_travis_install toolset=%TOOLSET%
+  - config_info_travis
+  - cd ..\..\integer\test
+  - ..\..\..\b2 -j3 toolset=%TOOLSET% define=CI_SUPPRESS_KNOWN_ISSUES