diff --git a/cmake/Modules/FindCXX11.cmake b/cmake/Modules/FindCXX11.cmake
deleted file mode 100644
index 3a21e958..00000000
--- a/cmake/Modules/FindCXX11.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-include(TestCXXAcceptsFlag)
-
-# try to use compiler flag -std=c++14
-check_cxx_accepts_flag("-std=c++14" CXX_FLAG_CXX14)
-if(CXX_FLAG_CXX14)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-  set(CXX_STD11_FLAGS "-std=c++14")
-  set(CXX_STD14_FLAGS "-std=c++14")
-else()
-  check_cxx_accepts_flag("-std=c++11" CXX_FLAG_CXX11)
-  if(CXX_FLAG_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    set(CXX_STD11_FLAGS "-std=c++11")
-  else()
-    # try to use compiler flag -std=c++0x for older compilers
-    check_cxx_accepts_flag("-std=c++0x" CXX_FLAG_CXX0X)
-    if(CXX_FLAG_CXX0X)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-      set(CXX_STD11_FLAGS "-std=c++0x")
-    endif()
-  endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CXX11 DEFAULT_MSG CXX_STD11_FLAGS)
diff --git a/cmake/Modules/FindIFEM.cmake b/cmake/Modules/FindIFEM.cmake
index bfb80bfd..787abec7 100644
--- a/cmake/Modules/FindIFEM.cmake
+++ b/cmake/Modules/FindIFEM.cmake
@@ -2,6 +2,9 @@
 enable_language(CXX)
 enable_language(Fortran)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Custom profiles
 
 if(NOT IFEM_BUILD_TYPE)
diff --git a/cmake/Modules/FindIFEMDeps.cmake b/cmake/Modules/FindIFEMDeps.cmake
index cf65ce13..f9e933fc 100644
--- a/cmake/Modules/FindIFEMDeps.cmake
+++ b/cmake/Modules/FindIFEMDeps.cmake
@@ -55,7 +55,9 @@ ENDIF(IFEM_WHOLE_PROG_OPTIM)
 FIND_PACKAGE(GoTools REQUIRED)
 FIND_PACKAGE(GoTrivariate REQUIRED)
 FIND_PACKAGE(ARPACK REQUIRED)
-find_package(CXX11 REQUIRED)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mimimum GoTools version
 IF(GoTools_VERSION_MAJOR LESS 3 OR NOT GoTools_VERSION_MAJOR)
diff --git a/cmake/Modules/FindISTL.cmake b/cmake/Modules/FindISTL.cmake
index e34b9d1d..20c988a3 100644
--- a/cmake/Modules/FindISTL.cmake
+++ b/cmake/Modules/FindISTL.cmake
@@ -38,15 +38,6 @@ endif()
 
 list(APPEND ISTL_INCLUDE_DIRS ${ISTL_INCLUDEDIR})
 
-if(DUNE_ISTL_VERSION_MAJOR GREATER 2 OR DUNE_ISTL_VERSION_MINOR GREATER 4)
-  if(NOT CXX_STD14_FLAGS)
-    message(STATUS dune-istl >= 2.5 requires c++14 support)
-    set(ISTL_LIBRARIES)
-    set(ISTL_DEFINITIONS)
-    set(ISTL_INCLUDE_DIRS)
-  endif()
-endif()
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ISTL DEFAULT_MSG
                                   ISTL_INCLUDE_DIRS ISTL_LIBRARIES)