diff --git a/src/haricot/cmake/TopLevelCMake.txt b/src/haricot/cmake/TopLevelCMake.txt
index 9bf7945..9734dc3 100644
--- a/src/haricot/cmake/TopLevelCMake.txt
+++ b/src/haricot/cmake/TopLevelCMake.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(workspace)
 
+enable_testing()
+
 set(cmd "dirname -z $(realpath CMakeLists.txt)")
 execute_process(COMMAND bash -c ${cmd}
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
diff --git a/src/haricot/cmake/stm32/stm32l4xx.cmake b/src/haricot/cmake/stm32/stm32l4xx.cmake
index 0af59eb..342cb92 100644
--- a/src/haricot/cmake/stm32/stm32l4xx.cmake
+++ b/src/haricot/cmake/stm32/stm32l4xx.cmake
@@ -4,7 +4,7 @@ endif()
 
 set(CUBE_HOME "$ENV{CUBE}" CACHE INTERNAL "Copied from environment variable")
 
-SET (CUBE_ROOT "${CUBE_HOME}/Repository/STM32Cube_FW_L4_V1.14.0")
+SET (CUBE_ROOT "${CUBE_HOME}/Repository/STM32Cube_FW_L4_V1.16.0")
  
 SET (LINKER_SCRIPT "${CUBE_ROOT}/Projects/NUCLEO-L476RG/Templates/SW4STM32/STM32L476RG_NUCLEO/STM32L476RGTx_FLASH.ld")
  
@@ -12,6 +12,6 @@ SET (CMAKE_SYSTEM_NAME Generic)
 SET (CMAKE_SYSTEM_PROCESSOR arm)
  
 
-SET(CMAKE_CXX_FLAGS "-mcpu=cortex-m4 -std=c++11 -fno-rtti -fno-exceptions -Wall -fdata-sections -ffunction-sections -MD -Wall -Wno-psabi" CACHE INTERNAL "cxx compiler flags")
+SET(CMAKE_CXX_FLAGS "-mcpu=cortex-m4 -std=c++17 -fno-rtti -fno-exceptions -Wall -fdata-sections -ffunction-sections -MD -Wall -Wno-psabi" CACHE INTERNAL "cxx compiler flags")
  
 SET (CMAKE_EXE_LINKER_FLAGS "-T ${LINKER_SCRIPT} -specs=nosys.specs -Wl,--gc-sections" CACHE INTERNAL "exe link flags")