diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index b6ee29b3d..78c7097b6 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -968,7 +968,7 @@ and current_to_previous_script =
 
 
 and cxx_infer_headers =
-  CLOpt.mk_bool ~long:"cxx-infer-headers" ~default:true
+  CLOpt.mk_bool ~long:"cxx-infer-headers" ~default:false
     ~in_help:InferCommand.([(Capture, manual_clang)])
     "Include C++ header models during compilation. Infer swaps some C++ headers for its own in \
      order to get a better model of, eg, the standard library. This can sometimes cause \
diff --git a/infer/tests/build_systems/clang_translation/Makefile b/infer/tests/build_systems/clang_translation/Makefile
index e854acdf4..7f5650735 100644
--- a/infer/tests/build_systems/clang_translation/Makefile
+++ b/infer/tests/build_systems/clang_translation/Makefile
@@ -24,7 +24,7 @@ CLEAN_EXTRA = $(DOT_FILES) $(foreach source,$(SOURCES),infer-out-$(basename $(no
 
 include $(TESTS_DIR)/clang-frontend.make
 
-INFER_OPTIONS = capture --frontend-tests --skip-translation-headers exclude_dir
+INFER_OPTIONS = capture --frontend-tests --skip-translation-headers exclude_dir --cxx-infer-headers
 
 capture: $(DOT_FILES)
 
diff --git a/infer/tests/codetoanalyze/cpp/errors/Makefile b/infer/tests/codetoanalyze/cpp/errors/Makefile
index 59eb7fa2c..f66677582 100644
--- a/infer/tests/codetoanalyze/cpp/errors/Makefile
+++ b/infer/tests/codetoanalyze/cpp/errors/Makefile
@@ -12,7 +12,7 @@ ANALYZER = checkers
 # use our own clang's standard library so that the tests are uniform across distributions
 CLANG_OPTIONS = -x c++ -std=c++1y -isystem$(ROOT_DIR) -c
 INFER_OPTIONS = --biabduction-only --ml-buckets cpp --debug-exceptions --project-root $(TESTS_DIR) \
-                --pmd-xml --report-custom-error
+                --pmd-xml --report-custom-error --cxx-infer-headers
 INFERPRINT_OPTIONS = --issues-tests
 
 SOURCES = \