diff --git a/test/appveyor.yml b/test/appveyor.yml
index 877a05b..5bf0530 100644
--- a/test/appveyor.yml
+++ b/test/appveyor.yml
@@ -8,7 +8,7 @@
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
 # and how it can be used with Boost libraries.
 #
-# File revision #4
+# File revision #5
 
 init:
     - set BRANCH_TO_TEST=%APPVEYOR_REPO_BRANCH%  # Change to branch you wish to test. Use %APPVEYOR_REPO_BRANCH% for current branch.
@@ -29,9 +29,7 @@ skip_tags: true
 
 before_build:
     - set PATH=%PATH%;C:\\MinGW\\bin
-    # Set this to the name of the library
-    - set PROJECT_TO_TEST=%APPVEYOR_PROJECT_NAME%
-    - echo "Testing %PROJECT_TO_TEST%"
+    - echo "Testing %APPVEYOR_PROJECT_NAME%"
     # Cloning Boost libraries (fast nondeep cloning)
     - set BOOST=C:/boost-local
     - git init %BOOST%
@@ -39,18 +37,17 @@ before_build:
     - git remote add --no-tags -t %BRANCH_TO_TEST% origin https://github.com/boostorg/boost.git
     - git fetch --depth=1
     - git checkout %BRANCH_TO_TEST%
-    - git submodule update --init --merge
+    - git submodule update --init --merge --jobs 16
     - git remote set-branches --add origin %BRANCH_TO_TEST%
-    - git pull --recurse-submodules
+    #- git pull --recurse-submodules        # Updaes submodules to most recent version. Not required
     - rm -rf %BOOST%/libs/%BOOST_REMOVE%
-    - mv %APPVEYOR_BUILD_FOLDER% %BOOST%/libs/%PROJECT_TO_TEST%
-    - set TRAVIS_BUILD_DIR=%BOOST%/libs/%PROJECT_TO_TEST%
+    - mv %APPVEYOR_BUILD_FOLDER% %BOOST%/libs/%APPVEYOR_PROJECT_NAME%
 
 build_script:
     - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
     - bootstrap.bat
     - b2.exe headers
-    - cd %BOOST%/libs/%PROJECT_TO_TEST%/test
+    - cd %BOOST%/libs/%APPVEYOR_PROJECT_NAME%/test
 
 after_build:
 before_test: