diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4639e0c..4fc4fda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ else ()
     message(STATUS "ccache not found")
 endif ()
 
-fetchcontent_declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+fetchcontent_declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz DOWNLOAD_EXTRACT_TIMESTAMP OFF)
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 option(JSON_ImplicitConversions "Enable implicit conversions." OFF)
 option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." ON)
@@ -63,6 +63,7 @@ set(LINKER_OPTIONS
 )
 
 option(ENABLE_COVERAGE "Enabling coverage" OFF)
+option(BILLY_ENABLE_TESTS "Enable Unit testing target" ON)
 
 if (${ENABLE_COVERAGE})
     message(STATUS "Coverage enabled")
@@ -125,4 +126,6 @@ install(FILES
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/billySheet
 )
 
-add_subdirectory("Unit testing")
+if (${BILLY_ENABLE_TESTS})
+    add_subdirectory("Unit testing")
+endif ()