diff --git a/.travis.yml b/.travis.yml
index 1066820..f42e6f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ matrix:
   include:
     - os: linux
       compiler: g++-4.4
-      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x TEST_SUITE=parameter_all_tests
+      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
       addons:
         apt:
           packages:
@@ -38,7 +38,7 @@ matrix:
 
     - os: linux
       compiler: g++-4.6
-      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x TEST_SUITE=parameter_all_tests
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
       addons:
         apt:
           packages:
@@ -47,7 +47,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 TEST_SUITE=parameter_all_tests
+      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -56,7 +56,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -65,7 +65,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -74,7 +74,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14
       addons:
         apt:
           packages:
@@ -83,16 +83,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=11,14 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - g++-5
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -101,25 +92,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - g++-6
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03 CXXSTD_DIALECT=cxxstd-dialect=gnu TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
-      addons:
-        apt:
-          packages:
-            - g++-6
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu TEST_SUITE=parameter_all_tests
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu
       addons:
         apt:
           packages:
@@ -130,7 +103,7 @@ matrix:
     - os: linux
       dist: trusty
       compiler: g++-7
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -141,29 +114,7 @@ matrix:
     - os: linux
       dist: trusty
       compiler: g++-7
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=11,14,17 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - g++-7
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      dist: trusty
-      compiler: g++-7
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03 CXXSTD_DIALECT=cxxstd-dialect=gnu TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
-      addons:
-        apt:
-          packages:
-            - g++-7
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      dist: trusty
-      compiler: g++-7
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=11,14,17 CXXSTD_DIALECT=cxxstd-dialect=gnu TEST_SUITE=parameter_all_tests
+      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 CXXSTD_DIALECT=cxxstd-dialect=gnu
       addons:
         apt:
           packages:
@@ -173,7 +124,7 @@ matrix:
 
     - os: linux
       compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03 TEST_SUITE=parameter_all_tests_except_preproc_eval_cat_8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -182,17 +133,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=11,14,17 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - g++-8
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -202,17 +143,7 @@ matrix:
             - llvm-toolchain-precise-3.5
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.5
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
+      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -222,17 +153,7 @@ matrix:
             - llvm-toolchain-precise-3.6
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
+      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11
       addons:
         apt:
           packages:
@@ -242,17 +163,7 @@ matrix:
             - llvm-toolchain-precise-3.7
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.7
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
+      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -262,47 +173,7 @@ matrix:
             - llvm-toolchain-precise-3.8
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=14,1z TEST_SUITE=parameter_all_but_python_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
-      addons:
-        apt:
-          packages:
-            - clang-3.9
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-3.9
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=14,1z TEST_SUITE=parameter_all_but_python_tests
+      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -313,29 +184,7 @@ matrix:
 
     - os: linux
       compiler: clang++-4.0
-      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
-      addons:
-        apt:
-          packages:
-            - clang-4.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-
-    - os: linux
-      compiler: clang++-4.0
-      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-4.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-
-    - os: linux
-      compiler: clang++-4.0
-      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=14,1z TEST_SUITE=parameter_all_but_python_tests
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -346,29 +195,7 @@ matrix:
 
     - os: linux
       compiler: clang++-5.0
-      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
-      addons:
-        apt:
-          packages:
-            - clang-5.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
-
-    - os: linux
-      compiler: clang++-5.0
-      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=11 TEST_SUITE=parameter_all_tests
-      addons:
-        apt:
-          packages:
-            - clang-5.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
-
-    - os: linux
-      compiler: clang++-5.0
-      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=14,1z TEST_SUITE=parameter_all_but_python_tests
+      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -379,17 +206,7 @@ matrix:
 
     - os: linux
       compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
-      addons:
-        apt:
-          packages:
-            - libstdc++-5-dev
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z TEST_SUITE=parameter_all_tests
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -399,36 +216,24 @@ matrix:
 
     - os: linux
       compiler: clang++-libc++
-      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03 TEST_SUITE=parameter_all_tests_cxx03
-      addons:
-        apt:
-          packages:
-            - libc++-dev
-
-    - os: linux
-      compiler: clang++-libc++
-      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z TEST_SUITE=parameter_all_tests
+      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - libc++-dev
 
     - os: osx
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z TEST_SUITE=parameter_all_tests
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03 TEST_SUITE=parameter_slp_tests
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
       osx_image: xcode7.3
 
     - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z TEST_SUITE=parameter_all_tests
-      osx_image: xcode7.3
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z TEST_SUITE=parameter_all_but_python_tests
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
       osx_image: xcode8.3
 
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+      osx_image: xcode9.4.1
+
 install:
   - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..
@@ -448,7 +253,7 @@ script:
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
   - ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET cxxstd=$CXXSTD || true
   - cd libs/parameter/test
-  - ../../../b2 $TEST_SUITE -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
+  - ../../../b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
   - cd ../../..
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 4b7ec23..85538b5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,50 +16,35 @@ branches:
 environment:
   matrix:
     - ARGS: --toolset=gcc address-model=32
-      TEST_SUITE: parameter_slp_tests
       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
-      TEST_SUITE: parameter_slp_tests
       PATH: C:\MinGW\bin;%PATH%
     - ARGS: --toolset=gcc address-model=64
-      TEST_SUITE: parameter_sl_tests
       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
-      TEST_SUITE: parameter_sl_tests
       PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       ARGS: --toolset=msvc-9.0  address-model=32
-      TEST_SUITE: parameter_all_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       ARGS: --toolset=msvc-10.0 address-model=32
-      TEST_SUITE: parameter_all_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       ARGS: --toolset=msvc-11.0 address-model=32
-      TEST_SUITE: parameter_msvc11_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       ARGS: --toolset=msvc-12.0 address-model=32
-      TEST_SUITE: parameter_msvc12plus_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       ARGS: --toolset=msvc-12.0 address-model=64
-      TEST_SUITE: parameter_msvc12plus_no_python_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ARGS: --toolset=msvc-14.0 address-model=32
-      TEST_SUITE: parameter_msvc12plus_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ARGS: --toolset=msvc-14.0 address-model=64
-      TEST_SUITE: parameter_msvc12plus_no_python_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
-      TEST_SUITE: parameter_msvc12plus_no_python_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ARGS: --toolset=msvc-14.1 address-model=32
-      TEST_SUITE: parameter_msvc12plus_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ARGS: --toolset=msvc-14.1 address-model=64
-      TEST_SUITE: parameter_msvc12plus_no_python_tests
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
-      TEST_SUITE: parameter_msvc12plus_no_python_tests
 
 install:
   - cd ..
@@ -78,5 +63,5 @@ build: off
 
 test_script:
   - cd libs\parameter\test
-  - ..\..\..\b2 -j%NUMBER_OF_PROCESSORS% --hash %ARGS% %TEST_SUITE%
+  - ..\..\..\b2 -j%NUMBER_OF_PROCESSORS% --hash %ARGS%
   - cd ..\..\..
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 8e6df1f..75e62a9 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -395,16 +395,41 @@ alias parameter_literate_tests
             <define>BOOST_PARAMETER_MAX_ARITY=2
     ]
     ;
-    
-alias parameter_python_test 
-    :
-    : 
-    
-        # Python always fails for mingw(-64)/gcc because of a Python header problem
-        # so we turn off this test for this compiler completely
 
+alias parameter_python_test
+    :
+    :
+        # Python fails for clang on linux with cxxstd set to 14
+        <target-os>linux
+        <toolset>clang
+        <cxxstd>14
+    ;
+
+alias parameter_python_test
+    :
+    :
+        # Python fails for clang on linux with cxxstd set to 1z
+        <target-os>linux
+        <toolset>clang
+        <cxxstd>1z
+    ;
+
+alias parameter_python_test
+    :
+    :
+        # Python fails for xcode 8.3.0 on osx
+        # so we turn off this test for this compiler completely for now
+        <target-os>darwin
+        # TODO: Differentiate by xcode version or by clang version
+    ;
+
+alias parameter_python_test
+    :
+    :
+        # Python fails for windows compilers with 64-bit addressing set
+        # because of a Python header problem
         <target-os>windows
-        <toolset>gcc
+        <address-model>64
     ;
 
 alias parameter_python_test
@@ -412,6 +437,65 @@ alias parameter_python_test
     [ bpl-test python_test ]
     ;
 
+alias parameter_macros_eval_category
+    :
+    :
+        <target-os>linux
+        <toolset>gcc
+        <version>4.8
+    ;
+
+alias parameter_macros_eval_category
+    :
+    :
+        # This test fails for xcode 7.3.0 on osx
+        # so we turn off this test for this compiler for now
+        <target-os>darwin
+        <cxxstd>03
+        # TODO: Differentiate by xcode version or by clang version
+    ;
+
+alias parameter_macros_eval_category
+    :
+    :
+        <target-os>windows
+        <toolset>gcc
+    ;
+
+alias parameter_macros_eval_category
+    :
+    [ run macros_eval_category.cpp
+        :
+        :
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=10
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=0
+        :
+            macros_eval_category_cxx03
+        :
+            <preserve-target-tests>off
+    ]
+    :
+        <cxxstd>98
+    ;
+
+alias parameter_macros_eval_category
+    :
+    [ run macros_eval_category.cpp
+        :
+        :
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=10
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=0
+        :
+            macros_eval_category_cxx03
+        :
+            <preserve-target-tests>off
+    ]
+    :
+        <cxxstd>03
+    ;
+
 alias parameter_macros_eval_category
     :
     [ run macros_eval_category.cpp
@@ -426,19 +510,63 @@ alias parameter_macros_eval_category
     ]
     ;
 
-alias parameter_macros_eval_category_cxx03
+alias parameter_evaluate_category_10
     :
-    [ run macros_eval_category.cpp
+    :
+        <target-os>linux
+        <toolset>gcc
+        <version>4.8
+    ;
+
+alias parameter_evaluate_category_10
+    :
+    :
+        # This test fails for xcode 7.3.0 on osx
+        # so we turn off this test for this compiler for now
+        <target-os>darwin
+        <cxxstd>03
+        # TODO: Differentiate by xcode version or by clang version
+    ;
+
+alias parameter_evaluate_category_10
+    :
+    :
+        <target-os>windows
+        <toolset>gcc
+    ;
+
+alias parameter_evaluate_category_10
+    :
+    [ run evaluate_category_10.cpp
         :
         :
         :
             <define>BOOST_PARAMETER_MAX_ARITY=10
             <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=0
         :
-            macros_eval_category_cxx03
+            evaluate_category_10_cxx03
         :
             <preserve-target-tests>off
     ]
+    :
+        <cxxstd>98
+    ;
+
+alias parameter_evaluate_category_10
+    :
+    [ run evaluate_category_10.cpp
+        :
+        :
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=10
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=0
+        :
+            evaluate_category_10_cxx03
+        :
+            <preserve-target-tests>off
+    ]
+    :
+        <cxxstd>03
     ;
 
 alias parameter_evaluate_category_10
@@ -455,19 +583,45 @@ alias parameter_evaluate_category_10
     ]
     ;
 
-alias parameter_evaluate_category_10_cxx03
+alias parameter_preprocessor_eval_cat_8
     :
-    [ run evaluate_category_10.cpp
-        :
-        :
-        :
-            <define>BOOST_PARAMETER_MAX_ARITY=10
-            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=0
-        :
-            evaluate_category_10_cxx03
-        :
-            <preserve-target-tests>off
-    ]
+    :
+        <target-os>linux
+        <toolset>gcc
+        <version>4.8
+    ;
+
+alias parameter_preprocessor_eval_cat_8
+    :
+    :
+        <target-os>linux
+        <toolset>gcc
+        <version>4.9
+    ;
+
+alias parameter_preprocessor_eval_cat_8
+    :
+    :
+        <target-os>linux
+        <toolset>gcc
+        <cxxstd>03
+    ;
+
+alias parameter_preprocessor_eval_cat_8
+    :
+    :
+        # This test fails for xcode 7.3.0 and xcode 8.3.0 on osx
+        # so we turn off this test for this compiler for now
+        <target-os>darwin
+        <cxxstd>03
+        # TODO: Differentiate by xcode version or by clang version
+    ;
+
+alias parameter_preprocessor_eval_cat_8
+    :
+    :
+        <target-os>windows
+        <toolset>gcc
     ;
 
 alias parameter_preprocessor_eval_cat_8
@@ -484,6 +638,23 @@ alias parameter_preprocessor_eval_cat_8
     ]
     ;
 
+alias parameter_preprocessor_eval_cat_fail
+    :
+    :
+        # This test fails for xcode 7.3.0 and xcode 8.3.0 on osx
+        # so we turn off this test for this compiler for now
+        <target-os>darwin
+        <cxxstd>03
+        # TODO: Differentiate by xcode version or by clang version
+    ;
+
+alias parameter_preprocessor_eval_cat_fail
+    :
+    :
+        <target-os>windows
+        <toolset>gcc
+    ;
+
 alias parameter_preprocessor_eval_cat_fail
     :
     [ compile-fail preprocessor_eval_category.cpp
@@ -496,66 +667,22 @@ alias parameter_preprocessor_eval_cat_fail
     ]
     ;
 
-alias parameter_all_stress_tests
+alias parameter_msvc_fail_tests ;
+
+alias parameter_msvc_fail_tests
     :
-        parameter_macros_eval_category
-        parameter_evaluate_category_10
-        parameter_preprocessor_eval_cat_8
-        parameter_preprocessor_eval_cat_fail
+    [ compile-fail compose.cpp
+        :
+            <define>LIBS_PARAMETER_TEST_COMPILE_FAILURE_MSVC
+        :
+            compose_msvc11_fail_11
+    ]
+    :
+        <toolset>msvc
+        <toolset-msvc:version>11.0
     ;
 
-alias parameter_all_stress_tests_except_preproc_eval_cat_8
-    :
-        parameter_macros_eval_category_cxx03
-        parameter_evaluate_category_10_cxx03
-        parameter_preprocessor_eval_cat_fail
-    ;
-
-alias parameter_all_stress_tests_cxx03
-    :
-        parameter_macros_eval_category_cxx03
-        parameter_evaluate_category_10_cxx03
-        parameter_preprocessor_eval_cat_8
-        parameter_preprocessor_eval_cat_fail
-    ;
-
-alias parameter_sl_tests
-    :
-        parameter_standard_tests
-        parameter_literate_tests
-    ;
-
-alias parameter_slp_tests
-    :
-        parameter_sl_tests
-        parameter_python_test
-    ;
-
-alias parameter_all_but_python_tests
-    :
-        parameter_all_stress_tests
-        parameter_sl_tests
-    ;
-
-alias parameter_all_tests
-    :
-        parameter_all_stress_tests
-        parameter_slp_tests
-    ;
-
-alias parameter_all_tests_except_preproc_eval_cat_8
-    :
-        parameter_all_stress_tests_except_preproc_eval_cat_8
-        parameter_slp_tests
-    ;
-
-alias parameter_all_tests_cxx03
-    :
-        parameter_all_stress_tests_cxx03
-        parameter_slp_tests
-    ;
-
-alias parameter_msvc12plus_fail_tests
+alias parameter_msvc_fail_tests
     :
     [ compile-fail evaluate_category.cpp
         :
@@ -573,32 +700,66 @@ alias parameter_msvc12plus_fail_tests
         :
             preproc_eval_cat_msvc_fail
     ]
+    :
+        <toolset>msvc
+        <toolset-msvc:version>12.0
     ;
 
-alias parameter_msvc12plus_no_python_tests
+alias parameter_msvc_fail_tests
     :
-        parameter_all_but_python_tests
-        parameter_msvc12plus_fail_tests
-    ;
-
-alias parameter_msvc12plus_tests
-    :
-        parameter_all_tests
-        parameter_msvc12plus_fail_tests
-    ;
-
-alias parameter_msvc11_fail_tests
-    :
-    [ compile-fail compose.cpp
+    [ compile-fail evaluate_category.cpp
         :
+            <define>BOOST_PARAMETER_MAX_ARITY=4
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=5
             <define>LIBS_PARAMETER_TEST_COMPILE_FAILURE_MSVC
         :
-            compose_msvc11_fail_11
+            evaluate_category_msvc_fail
     ]
+    [ compile-fail preprocessor_eval_category.cpp
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=8
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=9
+            <define>LIBS_PARAMETER_TEST_COMPILE_FAILURE_MSVC
+        :
+            preproc_eval_cat_msvc_fail
+    ]
+    :
+        <toolset>msvc
+        <toolset-msvc:version>14.0
     ;
 
-alias parameter_msvc11_tests
+alias parameter_msvc_fail_tests
     :
-        parameter_all_tests
-        parameter_msvc11_fail_tests
+    [ compile-fail evaluate_category.cpp
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=4
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=5
+            <define>LIBS_PARAMETER_TEST_COMPILE_FAILURE_MSVC
+        :
+            evaluate_category_msvc_fail
+    ]
+    [ compile-fail preprocessor_eval_category.cpp
+        :
+            <define>BOOST_PARAMETER_MAX_ARITY=8
+            <define>BOOST_PARAMETER_EXPONENTIAL_OVERLOAD_THRESHOLD_ARITY=9
+            <define>LIBS_PARAMETER_TEST_COMPILE_FAILURE_MSVC
+        :
+            preproc_eval_cat_msvc_fail
+    ]
+    :
+        <toolset>msvc
+        <toolset-msvc:version>14.1
+    ;
+
+# TODO: Replace with "undeprecated" version.
+test-suite "parameter"
+    :
+        parameter_macros_eval_category
+        parameter_evaluate_category_10
+        parameter_preprocessor_eval_cat_8
+        parameter_preprocessor_eval_cat_fail
+        parameter_standard_tests
+        parameter_literate_tests
+        parameter_python_test
+        parameter_msvc_fail_tests
     ;