diff --git a/CMakeLists.txt b/CMakeLists.txt
index 812ce94c8..8fde6117a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,6 @@ option(ENABLE_FGJS       "Set to ON to build the fgjs application (default)" ON)
 option(ENABLE_JS_DEMO    "Set to ON to build the js_demo application (default)" ON)
 option(ENABLE_METAR      "Set to ON to build the metar application (default)" ON)
 option(ENABLE_STGMERGE   "Set to ON to build the stgmerge application (default)" OFF)
-option(ENABLE_TESTS      "Set to ON to build test applications (default)" ON)
 option(ENABLE_FGCOM      "Set to ON to build the FGCom application (default)" ON)
 option(ENABLE_FLITE      "Set to ON to build the Flite text-to-speech module" ON)
 option(ENABLE_QT         "Set to ON to build the internal Qt launcher" ON)
@@ -562,16 +561,6 @@ configure_file (
 add_subdirectory(3rdparty)
 add_subdirectory(utils)
 
-if(ENABLE_TESTS)
-    # enable CTest / make test target
-    message(STATUS "Tests: ENABLED")
-
-    include (Dart)
-    enable_testing()
-else()
-    message(STATUS "Tests: DISABLED")
-endif(ENABLE_TESTS)
-
 add_subdirectory(src)
 add_subdirectory(icons)
 add_subdirectory(man)
@@ -594,4 +583,5 @@ ADD_CUSTOM_TARGET(uninstall
 
 
 # The test suite.
+enable_testing()
 add_subdirectory(test_suite EXCLUDE_FROM_ALL)
diff --git a/src/FDM/YASim/CMakeLists.txt b/src/FDM/YASim/CMakeLists.txt
index 3065af68a..87b38b5e6 100644
--- a/src/FDM/YASim/CMakeLists.txt
+++ b/src/FDM/YASim/CMakeLists.txt
@@ -37,7 +37,6 @@ set(SOURCES
 
 flightgear_component(YASim  "${SOURCES}")
 
-if(ENABLE_TESTS)
 add_executable(yasim yasim-test.cpp ${COMMON})
 add_executable(yasim-proptest proptest.cpp ${COMMON})
 add_executable(yasim-atmotest yasim-atmotest.cpp Atmosphere.cpp )
@@ -46,5 +45,3 @@ target_link_libraries(yasim SimGearCore)
 target_link_libraries(yasim-proptest SimGearCore)
 
 install(TARGETS yasim yasim-proptest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-endif(ENABLE_TESTS)
diff --git a/test_suite/CMakeLists.txt b/test_suite/CMakeLists.txt
index f734955f8..e20d6933b 100644
--- a/test_suite/CMakeLists.txt
+++ b/test_suite/CMakeLists.txt
@@ -60,6 +60,9 @@ endif()
 #-----------------------------------------------------------------------------
 # Set up all test suites as CTests.
 
+# Activation.
+include(Dart)
+
 # System test suites.
 add_test(AeroMeshSystemTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -s AeroMeshTests)