diff --git a/.travis.yml b/.travis.yml
index 3461619..2860748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,5 @@ script:
       rm -r * &&
       CXX=g++ cmake -DUSE_STANDALONE_ASIO=ON -DCMAKE_CXX_FLAGS=\"-Werror -O3\" .. &&
       make &&
-      CTEST_OUTPUT_ON_FAILURE=1 make test &&
-      rm -r * &&
-      CXX=g++ cmake -DCMAKE_CXX_FLAGS=\"-Werror -std=c++17 -O3\" .. &&
-      make &&
-      CTEST_OUTPUT_ON_FAILURE=1 make test &&         
-      rm -r * &&
-      CXX=g++ cmake -DUSE_STANDALONE_ASIO=ON -DCMAKE_CXX_FLAGS=\"-Werror -std=c++17 -O3\" .. &&
-      make &&
-      CTEST_OUTPUT_ON_FAILURE=1 make test      
+      CTEST_OUTPUT_ON_FAILURE=1 make test
       "
diff --git a/client_http.hpp b/client_http.hpp
index 1478e75..3e5a128 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -29,14 +29,20 @@ namespace SimpleWeb {
 } // namespace SimpleWeb
 #endif
 
-#if __cplusplus >= 201402L || (defined(_MSC_VER) && _MSC_VER >= 1910)
+#if __cplusplus > 201402L || (defined(_MSC_VER) && _MSC_VER >= 1910)
 #include <string_view>
-namespace SimpleWeb { using string_view = std::string_view; }
+namespace SimpleWeb {
+  using string_view = std::string_view;
+}
 #elif !defined(USE_STANDALONE_ASIO)
 #include <boost/utility/string_ref.hpp>
-namespace SimpleWeb { using string_view = boost::string_ref; }  
+namespace SimpleWeb {
+  using string_view = boost::string_ref;
+}
 #else
-namespace SimpleWeb { using string_view = const std::string &; }
+namespace SimpleWeb {
+  using string_view = const std::string &;
+}
 #endif
 
 namespace SimpleWeb {