diff --git a/infer/tests/codetoanalyze/objc/frontend/Makefile b/infer/tests/codetoanalyze/objc/frontend/Makefile
index 0d13b5bc9..9de7715fe 100644
--- a/infer/tests/codetoanalyze/objc/frontend/Makefile
+++ b/infer/tests/codetoanalyze/objc/frontend/Makefile
@@ -6,17 +6,37 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 
 
-.PHONY: arc.clean noarc.clean
-%.clean:
-	@$(MAKE) -C $% clean
+.PHONY: arc.clean
+arc.clean:
+	@$(MAKE) -C arc clean
 
-.PHONY: arc.print noarc.print
-%.print:
-	@$(MAKE) -C $% print
+.PHONY: noarc.clean
+noarc.clean:
+	@$(MAKE) -C noarc clean
 
-.PHONY: arc.test noarc.test
-%.test:
-	@$(MAKE) -C $% test
+.PHONY: arc.print
+arc.print:
+	@$(MAKE) -C arc print
+
+.PHONY: noarc.print
+noarc.print:
+	@$(MAKE) -C noarc print
+
+.PHONY: arc.test
+arc.test:
+	@$(MAKE) -C arc test
+
+.PHONY: noarc.test
+noarc.test:
+	@$(MAKE) -C noarc test
+
+.PHONY: arc.replace
+arc.replace:
+	@$(MAKE) -C arc replace
+
+.PHONY: noarc.replace
+noarc.replace:
+	@$(MAKE) -C noarc replace
 
 .PHONY: clean
 clean: arc.clean noarc.clean
@@ -26,3 +46,6 @@ print: arc.print noarc.print
 
 .PHONY: test
 test: arc.test noarc.test
+
+.PHONY: replace
+replace: arc.replace noarc.replace
diff --git a/infer/tests/codetoanalyze/objc/frontend/arc/Makefile b/infer/tests/codetoanalyze/objc/frontend/arc/Makefile
index cbc7b46c7..13abd7062 100644
--- a/infer/tests/codetoanalyze/objc/frontend/arc/Makefile
+++ b/infer/tests/codetoanalyze/objc/frontend/arc/Makefile
@@ -15,7 +15,7 @@ XCODEROOT = $(shell xcode-select -p)
 CLANG_OPTIONS = -x objective-c \
   -isysroot $(XCODEROOT)$(IPHONESIMULATOR_ISYSROOT_SUFFIX) \
   -mios-simulator-version-min=8.2 --target=x86_64-apple-darwin14 -c \
-  -fbobjc-arc
+  -fobjc-arc
 
 SOURCES = \
   ../predefined_expr/PredefinedExprExample.m \
diff --git a/infer/tests/codetoanalyze/objc/shared/assertions/NSAssert_example.m.dot b/infer/tests/codetoanalyze/objc/shared/assertions/NSAssert_example.m.dot
index 1893f1b2e..df80fb36f 100644
--- a/infer/tests/codetoanalyze/objc/shared/assertions/NSAssert_example.m.dot
+++ b/infer/tests/codetoanalyze/objc/shared/assertions/NSAssert_example.m.dot
@@ -90,7 +90,7 @@ digraph iCFG {
 	
 
 	 "NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_22" -> "NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_16" ;
-"NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_23" [label="23:  DeclStmt \n   n$33=_fun_NSString_stringWithUTF8String:(\"shared/assertions/NSAssert_example.m\":char*) [line 24]\n  _fun___objc_retain(n$33:class NSString*) [line 24]\n  *&__assert_file__:class NSString*=n$33 [line 24]\n " shape="box"]
+"NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_23" [label="23:  DeclStmt \n   n$33=_fun_NSString_stringWithUTF8String:(\"../shared/assertions/NSAssert_example.m\":char*) [line 24]\n  _fun___objc_retain(n$33:class NSString*) [line 24]\n  *&__assert_file__:class NSString*=n$33 [line 24]\n " shape="box"]
 	
 
 	 "NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_23" -> "NSAssert_initWithRequest:instance.5013facd97881754f192867cc14cda52_18" ;
@@ -185,7 +185,7 @@ digraph iCFG {
 	
 
 	 "NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_22" -> "NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_16" ;
-"NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_23" [label="23:  DeclStmt \n   n$16=_fun_NSString_stringWithUTF8String:(\"shared/assertions/NSAssert_example.m\":char*) [line 19]\n  _fun___objc_retain(n$16:class NSString*) [line 19]\n  *&__assert_file__:class NSString*=n$16 [line 19]\n " shape="box"]
+"NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_23" [label="23:  DeclStmt \n   n$16=_fun_NSString_stringWithUTF8String:(\"../shared/assertions/NSAssert_example.m\":char*) [line 19]\n  _fun___objc_retain(n$16:class NSString*) [line 19]\n  *&__assert_file__:class NSString*=n$16 [line 19]\n " shape="box"]
 	
 
 	 "NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_23" -> "NSAssert_addTarget:instance.ef92ae23a24cf8063db0d913a051ea02_18" ;
@@ -280,7 +280,7 @@ digraph iCFG {
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_22" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_16" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_23" [label="23:  DeclStmt \n   n$15=_fun_NSString_stringWithUTF8String:(\"shared/assertions/NSAssert_example.m\":char*) [line 31]\n  _fun___objc_retain(n$15:class NSString*) [line 31]\n  *&__assert_file__:class NSString*=n$15 [line 31]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_23" [label="23:  DeclStmt \n   n$15=_fun_NSString_stringWithUTF8String:(\"../shared/assertions/NSAssert_example.m\":char*) [line 31]\n  _fun___objc_retain(n$15:class NSString*) [line 31]\n  *&__assert_file__:class NSString*=n$15 [line 31]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_23" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_18" ;
@@ -400,7 +400,7 @@ digraph iCFG {
 	
 
 	 "test2.ad0234829205b9033196ba818f7a872b_21" -> "test2.ad0234829205b9033196ba818f7a872b_15" ;
-"test2.ad0234829205b9033196ba818f7a872b_22" [label="22:  DeclStmt \n   n$16=_fun_NSString_stringWithUTF8String:(\"shared/assertions/NSAssert_example.m\":char*) [line 36]\n  _fun___objc_retain(n$16:class NSString*) [line 36]\n  *&__assert_file__:class NSString*=n$16 [line 36]\n " shape="box"]
+"test2.ad0234829205b9033196ba818f7a872b_22" [label="22:  DeclStmt \n   n$16=_fun_NSString_stringWithUTF8String:(\"../shared/assertions/NSAssert_example.m\":char*) [line 36]\n  _fun___objc_retain(n$16:class NSString*) [line 36]\n  *&__assert_file__:class NSString*=n$16 [line 36]\n " shape="box"]
 	
 
 	 "test2.ad0234829205b9033196ba818f7a872b_22" -> "test2.ad0234829205b9033196ba818f7a872b_17" ;
diff --git a/infer/tests/codetoanalyze/objc/shared/memory_leaks_benchmark/AutoreleaseExample.m.dot b/infer/tests/codetoanalyze/objc/shared/memory_leaks_benchmark/AutoreleaseExample.m.dot
index 6abb2adbf..1969c708d 100644
--- a/infer/tests/codetoanalyze/objc/shared/memory_leaks_benchmark/AutoreleaseExample.m.dot
+++ b/infer/tests/codetoanalyze/objc/shared/memory_leaks_benchmark/AutoreleaseExample.m.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 	
 
 	 "autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_3" -> "autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_2" ;
-"autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_4" [label="4:  Release the autorelease pool \n   n$0=_fun___objc_release_autorelease_pool(&s1:class Auto*,&s2:class Auto*,&s3:class Auto*) [line 38]\n " shape="box"]
+"autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_4" [label="4:  Release the autorelease pool \n   n$0=_fun___objc_release_autorelease_pool(&s3:class Auto*,&s1:class Auto*,&s2:class Auto*) [line 38]\n " shape="box"]
 	
 
 	 "autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_4" -> "autorelease_test1.8f3499e28c7129f0f6b2300d214d7864_3" ;
@@ -69,7 +69,7 @@ digraph iCFG {
 	
 
 	 "autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_3" -> "autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_2" ;
-"autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_4" [label="4:  Release the autorelease pool \n   n$0=_fun___objc_release_autorelease_pool(&s1:class Auto*,&s3:class Auto*,&s2:class Auto*) [line 51]\n " shape="box"]
+"autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_4" [label="4:  Release the autorelease pool \n   n$0=_fun___objc_release_autorelease_pool(&s2:class Auto*,&s3:class Auto*,&s1:class Auto*) [line 51]\n " shape="box"]
 	
 
 	 "autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_4" -> "autorelease_test2.d978c6e21f1931e19bc731b4ffb90225_3" ;