diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 646adc2cf5aeb768447e2e42de66da79c083c982..70305fbb0142eccdf605611d1e68f702cd0bd756 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -166,6 +166,7 @@ macro(module)
   file(MAKE_DIRECTORY ${LIB_STAGE_PATH})
   file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
   file(MAKE_DIRECTORY ${LIBEXEC_STAGE_PATH})
+  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
   if (NOT TARGET make_stage_lib_dir)
     add_custom_target(make_stage_lib_dir COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_STAGE_PATH})
   endif()
@@ -175,6 +176,9 @@ macro(module)
   if (NOT TARGET make_libexec_dir)
     add_custom_target(make_libexec_dir COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBEXEC_STAGE_PATH})
   endif()
+  if (NOT TARGET make_tests_dir)
+    add_custom_target(make_tests_dir COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/tests")
+  endif()
   if (WIN32)
     set(_ABS_FILE_PATTERN "^[A-Z]:/")
   else()
@@ -204,6 +208,7 @@ macro(module)
     add_dependencies(${_LIB_NAME} make_stage_lib_dir)
     add_dependencies(${_LIB_NAME} make_executable_output_dir)
     add_dependencies(${_LIB_NAME} make_libexec_dir)
+    add_dependencies(${_LIB_NAME} make_tests_dir)
     set_target_properties(${_LIB_NAME} PROPERTIES
                           COMPILE_DEFINITIONS OST_MODULE_${_UPPER_LIB_NAME})
     set_target_properties(${_LIB_NAME} PROPERTIES