diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
index b4f365dd0..a96c8567e 100644
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
@@ -1,7 +1,8 @@
 #ifndef FLATBUFFERS_BASE_H_
 #define FLATBUFFERS_BASE_H_
 
-#if defined(_MSC_VER) && defined(_DEBUG)
+#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+    defined(_MSC_VER) && defined(_DEBUG)
   #define _CRTDBG_MAP_ALLOC
 #endif
 
@@ -15,7 +16,8 @@
 #include <cstdlib>
 #include <cstring>
 
-#if defined(_MSC_VER) && defined(_DEBUG)
+#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+    defined(_MSC_VER) && defined(_DEBUG)
   #include <crtdbg.h>
   #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
   #define new DEBUG_NEW
diff --git a/tests/test.cpp b/tests/test.cpp
index 1062c09a3..63a73c730 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1749,7 +1749,8 @@ void TypeAliasesTest()
 }
 
 int main(int /*argc*/, const char * /*argv*/[]) {
-  #if defined(_MSC_VER) && defined(_DEBUG)
+  #if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+      defined(_MSC_VER) && defined(_DEBUG)
     _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF
       // For more thorough checking:
       //| _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_DELAY_FREE_MEM_DF