diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42ae03468..96fde7dc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,9 @@ find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CUR
 
 # Initialise project
 project( eccodes VERSION 2.30.0 LANGUAGES CXX )
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 
 ###############################################################################
 # system checks needed for eccodes_config.h and some options like MEMFS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e62e2ee1b..11ad25254 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND test_c_bins
     grib_optimize_scaling_sh
     grib_set_force
     grib_ecc-386
-    # grib_ecc-1431
+    grib_ecc-1431
     bufr_ecc-517
     bufr_ecc-1288
     bufr_get_element
@@ -271,9 +271,9 @@ if( HAVE_BUILD_TOOLS )
         codes_split_file
         grib_mars_keys)
 
-    #if( HAVE_AEC AND ENABLE_EXTRA_TESTS )
-    #    list(APPEND tests_extra grib_ecc-1431)
-    #endif()
+    if( HAVE_AEC AND ENABLE_EXTRA_TESTS )
+        list(APPEND tests_extra grib_ecc-1431)
+    endif()
     if( HAVE_FORTRAN AND ENABLE_EXTRA_TESTS )
         list(APPEND tests_extra bufr_dump_encode_fortran)
         list(APPEND tests_extra bufr_dump_decode_fortran)