diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a1ff16aa..f5647f26c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,7 +350,7 @@ endif()
 #
 # Google Test
 #
-if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt")
+if(BUILD_TESTS AND NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt")
   message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
 endif()
 
diff --git a/ChangeLog b/ChangeLog
index 5d9232f5c..2613a021e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Bug fixes:
 - #6814 The system asks to save twice. 
 - #6817 Configure requires dns_sd.h for enterprise version
 - #6821 Blocker bugs found by sonar
+- #6825 The system requires google test even when tests are disabled with BUILD_TESTS=OFF
 
 Enhancements:
 - #6750 Integrate SonarCloud for static analysis and test coverage