--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 
 project(sylvan VERSION 1.1.1)
 
@@ -24,8 +24,5 @@ message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
 
-set(CMAKE_C_FLAGS "-O2 -Wextra -Wall -Werror -fno-strict-aliasing ${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "-O2 -Wextra -Wall -Werror -fno-strict-aliasing -Wno-deprecated ${CMAKE_CXX_FLAGS}")
-
 option(WITH_COVERAGE "Add generation of test coverage" OFF)
 if(WITH_COVERAGE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -coverage")
@@ -51,9 +48,12 @@ endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include(GNUInstallDirs)
+include(CTest)
 
 add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+    add_subdirectory(test)
+endif()
 
 option(SYLVAN_BUILD_EXAMPLES "Build example tools" ON)
 if(SYLVAN_BUILD_EXAMPLES)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,3 @@
-enable_testing()
-
 add_executable(test_basic test_basic.c)
 target_link_libraries(test_basic sylvan)