diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 0a04aaf..795f5c9 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -64,6 +64,7 @@ target_link_libraries (create-test-files
   protobuf
 )
 
+if (ENABLE_TEST)
 if (TEST_VALGRIND_MEMCHECK)
   add_test (orc-test
           valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test)
@@ -78,3 +79,4 @@ if (WIN32)
       ENVIRONMENT "TZDIR=${TZDATA_DIR}"
     )
 endif ()
+endif()
\ No newline at end of file
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index c816cdc..16075f2 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -157,7 +157,7 @@ endif ()
 # ----------------------------------------------------------------------
 # IANA - Time Zone Database
 
-if (WIN32)
+if (WIN32 AND TEST_VALGRIND_MEMCHECK)
   ExternalProject_Add(tzdata_ep
     URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz"
     URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D