diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
index c4088f99a34b50367fa676f9e191457aa7bba2f5..457d6f9df0f85ac106b1f18caa859b7c12a32215 100755
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
@@ -385,7 +385,7 @@ def writeTestDescription( output, suite, test ):
     if not options.noStaticInit:
         output.write( ' %s() : CxxTest::RealTestDescription( %s, %s, %s, "%s" ) {}\n' %
                       (test['class'], suite['tlist'], suite['dobject'], test['line'], test['name']) )
-    output.write( ' void runTest() { %s }\n' % runBody( suite, test ) )
+    output.write( ' void runTest() final { %s }\n' % runBody( suite, test ) )
     output.write( '} %s;\n\n' % test['object'] )
 
 def runBody( suite, test ):
diff --git a/buildconfig/CMake/GNUSetup.cmake b/buildconfig/CMake/GNUSetup.cmake
index b9a49c768e832e0d78741067bf0f0588edbbbd7c..d883da497b93c5d1b2b1b708ae78a493ee7be9ba 100644
--- a/buildconfig/CMake/GNUSetup.cmake
+++ b/buildconfig/CMake/GNUSetup.cmake
@@ -43,7 +43,8 @@ endif()
 # Check if we have a new enough version for these flags
 if ( CMAKE_COMPILER_IS_GNUCXX )
   if (NOT (GCC_COMPILER_VERSION VERSION_LESS "5.1"))
-    set(GNUFLAGS "${GNUFLAGS} -Wsuggest-override -Wsuggest-final-types -Wsuggest-final-methods")
+    set(GNUFLAGS "${GNUFLAGS} -Wsuggest-override")
+    #set(GNUFLAGS "${GNUFLAGS}  -Wsuggest-final-types -Wsuggest-final-methods")
   endif()
 endif()