diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index 6002be775..2c21c4b6e 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -40,7 +40,7 @@ set(GCOV FALSE CACHE BOOL "Use gcov build flags")
 set(WITH_SCRIPTS TRUE CACHE BOOL "Install init.d scripts and ldconf configuration files")
 
 # Build tests
-set(BUILD_TESTS FALSE CACHE BOOL "Build tests")
+set(BUILD_TESTS TRUE CACHE BOOL "Build tests")
 
 # Build packages
 set(PACKAGE FALSE CACHE BOOL "Enable package building (this disables local installation of system files)")
diff --git a/server/modules/protocol/MySQL/CMakeLists.txt b/server/modules/protocol/MySQL/CMakeLists.txt
index 31730dc9b..a9ceabada 100644
--- a/server/modules/protocol/MySQL/CMakeLists.txt
+++ b/server/modules/protocol/MySQL/CMakeLists.txt
@@ -5,4 +5,7 @@ install_module(mysqlcommon core)
 
 add_subdirectory(mariadbbackend)
 add_subdirectory(mariadbclient)
-add_subdirectory(test)
+
+if (BUILD_TESTS)
+  add_subdirectory(test)
+endif()