diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7ed7baa..3cd407e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -96,5 +96,6 @@ if (${ASAN_AVAILABLE})
 endif()
 
 if (${UBSAN_AVAILABLE})
-    add_subdirectory(sanitize-undefined-behavior)
+    # TODO: Disabled until https://github.com/microsoft/STL/issues/3568 is resolved
+    # add_subdirectory(sanitize-undefined-behavior)
 endif()
diff --git a/tests/sanitize-address/CMakeLists.txt b/tests/sanitize-address/CMakeLists.txt
index 73a4231..d7f6194 100644
--- a/tests/sanitize-address/CMakeLists.txt
+++ b/tests/sanitize-address/CMakeLists.txt
@@ -12,6 +12,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_definitions(witest.asan PRIVATE
         # Not compatible with using lld-link
         -D_DISABLE_VECTOR_ANNOTATION
+        -D_DISABLE_STRING_ANNOTATION
         # See below; not compatible with exceptions
         -DCATCH_CONFIG_DISABLE_EXCEPTIONS
         )