diff --git a/cmake/test_mode.cmake b/cmake/test_mode.cmake
index 96d32d225..486186bd5 100644
--- a/cmake/test_mode.cmake
+++ b/cmake/test_mode.cmake
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.11)
 
-if (${BUILD_TESTING})
 if (DEFINED TEST_TARGET)
   macro(can_build_io_tests ret)
       set(${ret} false)
@@ -40,7 +39,6 @@ if (DEFINED TEST_TARGET)
           set(${ret} true)
       endif()
   endmacro()
-endif ()
 else()
   macro(can_build_io_tests ret)
       set(${ret} false)
diff --git a/conanfile.py b/conanfile.py
index 27e5273b9..d70d168fd 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.4.31"
+    version = "6.4.32"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"
@@ -69,14 +69,13 @@ def layout(self):
     def generate(self):
         # This generates "conan_toolchain.cmake" in self.generators_folder
         tc = CMakeToolchain(self)
-        if not self.conf.get("tools.build:skip_test", default=False):
-            tc.variables["BUILD_TESTING"] = "ON"
+        if self.options.testing != "off":
+            tc.variables["TEST_TARGET"] = self.options.testing
         tc.variables["CONAN_CMAKE_SILENT_OUTPUT"] = "ON"
         tc.variables['CMAKE_EXPORT_COMPILE_COMMANDS'] = 'ON'
         tc.variables["CTEST_OUTPUT_ON_FAILURE"] = "ON"
         tc.variables["MEMORY_SANITIZER_ON"] = "OFF"
         tc.variables["BUILD_COVERAGE"] = "OFF"
-        tc.variables["TEST_TARGET"] = self.options.testing
         if self.settings.build_type == "Debug":
             if self.options.get_safe("coverage"):
                 tc.variables['BUILD_COVERAGE'] = 'ON'