diff --git a/.travis.yml b/.travis.yml
index 8d61666..ec6a5a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,18 +102,18 @@
 #        apt:
 #          packages: ["g++-5",   "valgrind", "g++-5-multilib",   "libc6-dbg", "libc6-dbg:i386"]
 #          sources: *apt_sources
-
-#    # GCC 6
-#    # released on 2016.04.27
-#    # wait for it to enter the whitelist - https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-#    # also with homebrew under OSX!!!
-#    - env: COMPILER=g++-6 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
-#      compiler: gcc
-#      addons: &gcc6
-#        apt:
-#          packages: ["g++-6",   "valgrind", "g++-6-multilib",   "libc6-dbg", "libc6-dbg:i386"]
-#          sources: *apt_sources
-
+#
+##    # GCC 6
+##    # released on 2016.04.27
+##    # wait for it to enter the whitelist - https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+##    # also with homebrew under OSX!!!
+##    - env: COMPILER=g++-6 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
+##      compiler: gcc
+##      addons: &gcc6
+##        apt:
+##          packages: ["g++-6",   "valgrind", "g++-6-multilib",   "libc6-dbg", "libc6-dbg:i386"]
+##          sources: *apt_sources
+#
 #    # Clang 3.4
 #    - env: COMPILER=clang++ HAS_ASAN_64=true HAS_UBSAN_64=true
 #      addons: &clang
@@ -217,12 +217,12 @@
 #    - env: COMPILER=g++-4.9 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
 #      compiler: gcc
 #      os: osx
-
-    # OSX GCC 5
-    - env: COMPILER=g++-5 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
-      compiler: gcc
-      os: osx
-
+#
+#    # OSX GCC 5
+#    - env: COMPILER=g++-5 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
+#      compiler: gcc
+#      os: osx
+#
 #    # OSX LLVM-GCC
 #    - env: COMPILER=g++
 #      compiler: gcc
diff --git a/doctest/doctest.h b/doctest/doctest.h
index f4c1902..92b4e66 100644
--- a/doctest/doctest.h
+++ b/doctest/doctest.h
@@ -288,10 +288,7 @@
     template <typename L>
     struct Expression_lhs
     {
-#if defined(_MSC_VER) && _MSC_VER > 1200
-        const
-#endif
-                L lhs;
+        L lhs;
 
         Expression_lhs(L in)
                 : lhs(in) {}
@@ -521,7 +518,7 @@
                         DOCTEST_ASSERT_IMPLEMENT(expr, assert_name, is_check, false_invert_op)     \
                                 _Pragma("clang diagnostic pop")                                    \
     } while(false)
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
 #define DOCTEST_ASSERT_PROXY(expr, assert_name, is_check, false_invert_op)                         \
     do {                                                                                           \
         __pragma(warning(push)) __pragma(warning(disable : 4127))                                  \