diff --git a/.travis.yml b/.travis.yml
index 8d42327..b86f4ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,21 +6,35 @@ os:
 matrix:
   include:
     - os: linux
-      env: COMPILER=g++-4.9
+      env: COMPILER=g++-6
       addons:
         apt:
           packages:
-            - g++-4.9
+            - g++-6
           sources: &sources
             - llvm-toolchain-trusty-3.8
             - llvm-toolchain-trusty-5.0
             - ubuntu-toolchain-r-test
     - os: linux
-      env: COMPILER=g++-4.9 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes
+      env: COMPILER=g++-6 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes
       addons:
         apt:
           packages:
-            - g++-4.9
+            - g++-6
+          sources: *sources
+    - os: linux
+      env: COMPILER=g++-7
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources: *sources
+    - os: linux
+      env: COMPILER=g++-7 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes
+      addons:
+        apt:
+          packages:
+            - g++-7
           sources: *sources
     - os: linux
       env: COMPILER=g++-5
diff --git a/cmake/cxxopts.cmake b/cmake/cxxopts.cmake
index ef975b8..e7307f5 100644
--- a/cmake/cxxopts.cmake
+++ b/cmake/cxxopts.cmake
@@ -73,7 +73,7 @@ function(cxxopts_enable_warnings)
     if(MSVC)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W2")
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wshadow -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion -Wsuggest-override")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wshadow -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion")
     endif()
 
     set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)