diff --git a/infer/tests/codetoanalyze/cpp/errors/Makefile b/infer/tests/codetoanalyze/cpp/errors/Makefile
index 41493b7cb..ae69c4b37 100644
--- a/infer/tests/codetoanalyze/cpp/errors/Makefile
+++ b/infer/tests/codetoanalyze/cpp/errors/Makefile
@@ -7,7 +7,7 @@
 
 include ../../Makefile.clang
 
-OPTIONS = -x c++ -std=c++11 -isystem$(MODELS_DIR)/cpp/include -isystem$(CLANG_INCLUDES)/c++/v1/ -c
+OPTIONS = -x c++ -std=c++11 -isystem$(ROOT_DIR) -isystem$(CLANG_INCLUDES)/c++/v1/ -c
 
 FILES = \
   c_tests/*.cpp \
diff --git a/infer/tests/codetoanalyze/cpp/frontend/Makefile b/infer/tests/codetoanalyze/cpp/frontend/Makefile
index 27fa81d1b..e01891ba4 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/Makefile
+++ b/infer/tests/codetoanalyze/cpp/frontend/Makefile
@@ -7,7 +7,7 @@
 
 include ../../Makefile.frontend
 
-OPTIONS = -x c++ -std=c++11 -isystem$(MODELS_DIR)/cpp/include -isystem$(CLANG_INCLUDES)/c++/v1/ -c
+OPTIONS = -x c++ -std=c++11 -isystem$(ROOT_DIR) -isystem$(CLANG_INCLUDES)/c++/v1/ -c
 
 FILES = \
   */*.cpp shared/*/*.cpp \
diff --git a/infer/tests/codetoanalyze/cpp/shared/attributes/deprecated_hack.cpp b/infer/tests/codetoanalyze/cpp/shared/attributes/deprecated_hack.cpp
index 370bd4049..973fd5c7f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/attributes/deprecated_hack.cpp
+++ b/infer/tests/codetoanalyze/cpp/shared/attributes/deprecated_hack.cpp
@@ -9,9 +9,9 @@
 
 // header required by TranslateAsPtr class. It's not in common header search
 // path when running clang without infer (clang wrappers add it)
-// Add -isystem '/path/models/cpp/include' to clang invocation to work around
+// Add -isystem '/path/to/infer/repo' to clang invocation to work around
 // compilation problem
-#include <infer_model/infer_traits.h>
+#include <infer/models/cpp/include/infer_model/infer_traits.h>
 
 /* Test for passing function attributes to infer via __deprecated__ attribute */