diff --git a/.travis.yml b/.travis.yml
index 1b6ff95..b7ebd40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 # Copyright 2016 Peter Dimov
 # Copyright 2017 - 2019 James E. King III
+# Copyright 2020 Krystian Stasiowski
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -179,15 +180,15 @@ jobs:
     - { os: "linux", env: [ "B2_TOOLSET=gcc-5",       "B2_CXXSTD=11"       ], addons: *gcc-5     }
     - { os: "linux", env: [ "B2_TOOLSET=gcc-6",       "B2_CXXSTD=11,14"    ], addons: *gcc-6     }
     - { os: "linux", env: [ "B2_TOOLSET=gcc-7",       "B2_CXXSTD=14,17"    ], addons: *gcc-7     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-8",       "B2_CXXSTD=17,2a"    ], addons: *gcc-8     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-9",       "B2_CXXSTD=17,2a"    ], addons: *gcc-9     }
+    - { os: "linux", env: [ "B2_TOOLSET=gcc-8",       "B2_CXXSTD=17"    ], addons: *gcc-8     }
+    - { os: "linux", env: [ "B2_TOOLSET=gcc-9",       "B2_CXXSTD=17"    ], addons: *gcc-9     }
     - { os: "linux", dist: "trusty",  # xenial has libstdc++ from gcc 5.4.0 with newer ABI
                      env: [ "B2_TOOLSET=clang-3.8",   "B2_CXXSTD=11"       ], addons: *clang-38  }
     - { os: "linux", env: [ "B2_TOOLSET=clang-4.0",   "B2_CXXSTD=11,14"    ], addons: *clang-4   }
     - { os: "linux", env: [ "B2_TOOLSET=clang-5.0",   "B2_CXXSTD=11,14"    ], addons: *clang-5   }
     - { os: "linux", env: [ "B2_TOOLSET=clang-6.0",   "B2_CXXSTD=14,17"    ], addons: *clang-6   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-7",     "B2_CXXSTD=17,2a"    ], addons: *clang-7   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-8",     "B2_CXXSTD=17,2a"    ], addons: *clang-8   }
+    - { os: "linux", env: [ "B2_TOOLSET=clang-7",     "B2_CXXSTD=17"    ], addons: *clang-7   }
+    - { os: "linux", env: [ "B2_TOOLSET=clang-8",     "B2_CXXSTD=17"    ], addons: *clang-8   }
 
     # libc++
     - { os: "linux", env: [ "B2_TOOLSET=clang-6.0",   "B2_CXXSTD=11,14",
@@ -233,11 +234,11 @@ jobs:
         
     # Standalone tests for StaticString
     - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=gcc-7",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *gcc-7     }
-    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=gcc-8",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17,2a"    ], addons: *gcc-8     }
-    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=gcc-9",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17,2a"    ], addons: *gcc-9     }
+    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=gcc-8",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *gcc-8     }
+    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=gcc-9",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *gcc-9     }
     - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang-6.0",   "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *clang-6   }
-    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang-7",     "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17,2a"    ], addons: *clang-7   }
-    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang-8",     "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17,2a"    ], addons: *clang-8   }
+    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang-7",     "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *clang-7   }
+    - { os: "linux", env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang-8",     "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ], addons: *clang-8   }
     - { os: "osx"  , env: [ "COMMENT=STANDALONE",       "B2_TOOLSET=clang",       "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE",       "B2_CXXSTD=17"    ]                     }
         
 notifications: