diff --git a/.travis.yml b/.travis.yml
index 0a4f55d0..8619b2a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -430,9 +430,11 @@ install:
   - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
   - git submodule update --init tools/build
-  - git submodule update --init tools/boostdep
+  - git submodule update --init libs/detail
+  - git submodule update --init libs/core
+  - git submodule update --init libs/assert
+  - git submodule update --init libs/type_traits
   - cp -r $TRAVIS_BUILD_DIR/* libs/config
-  - python tools/boostdep/depinst/depinst.py config
   - ./bootstrap.sh
   - ./b2 headers
  
diff --git a/appveyor.yml b/appveyor.yml
index d953963b..5023f41b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,15 +23,25 @@ environment:
     - 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=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
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\config
   - git submodule update --init tools/build
-  - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
-  - python tools/boostdep/depinst/depinst.py config
+  - git submodule update --init libs/detail
+  - git submodule update --init libs/core
+  - git submodule update --init libs/assert
+  - git submodule update --init libs/type_traits
   - bootstrap
   - b2 headers
   - dir