diff --git a/test/ARM/standalone/GCexternList/GCexternList.test b/test/ARM/standalone/GCexternList/GCexternList.test
index 0cec43b051..19a3a58c98 100644
--- a/test/ARM/standalone/GCexternList/GCexternList.test
+++ b/test/ARM/standalone/GCexternList/GCexternList.test
@@ -6,5 +6,5 @@ RUN: %link %linkopts -march arm %t1.o %tlib.a --entry main -o %t.out --extern-li
 RUN: %nm -n %t.out  | %filecheck %s
 
 #CHECK:         U externSym
-#CHECK:00000014 T foo
+#CHECK: T foo
 
diff --git a/test/ARM/standalone/LTO/Map/Archive/mapfileltoarchive.test b/test/ARM/standalone/LTO/Map/Archive/mapfileltoarchive.test
index 4b6f9385ce..345793f55e 100644
--- a/test/ARM/standalone/LTO/Map/Archive/mapfileltoarchive.test
+++ b/test/ARM/standalone/LTO/Map/Archive/mapfileltoarchive.test
@@ -26,7 +26,7 @@ RUN: %link %linkopts -march arm -flto-options=codegen="-Os -relocation-model=sta
 #CHECK: common_array	0x50	{{[ -\(\)_A-Za-z0-9.~\\/:]+}}main.o
 #CHECK: Linker Script and memory map
 #CHECK: SKIPPED {{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o (ELF)
-#CHECK: .text	0x0	{{[0-9a-fx]+}}
+#CHECK: .text	{{[0-9a-fx]+}}	{{[0-9a-fx]+}}
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.~\\/:]+}}main.o
 #CHECK: 	{{[0-9a-fx]+}}  	main
 #CHECK: .text.foo	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.~\\/:]+}}lto
diff --git a/test/ARM/standalone/Map/Archive/mapfilearchive.test b/test/ARM/standalone/Map/Archive/mapfilearchive.test
index 7c734ca7c5..48c603fa7c 100644
--- a/test/ARM/standalone/Map/Archive/mapfilearchive.test
+++ b/test/ARM/standalone/Map/Archive/mapfilearchive.test
@@ -10,7 +10,7 @@ RUN: %link %linkopts -march arm %t1.main.o %t1.library.a -M -o %t2.out 2>&1 | %f
 #CHECK: Common symbol	size	file
 #CHECK: common_array	0x50	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: Linker Script and memory map
-#CHECK: .text	0x0	{{[0-9a-fx]+}}
+#CHECK: .text	{{[0-9a-fx]+}}	{{[0-9a-fx]+}}
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: 	{{[0-9a-fx]+}}  	main
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}foo.o
diff --git a/test/ARM/standalone/Map/Objects/mapfileonlyobjects.test b/test/ARM/standalone/Map/Objects/mapfileonlyobjects.test
index 6a59b5388b..477b931fe1 100644
--- a/test/ARM/standalone/Map/Objects/mapfileonlyobjects.test
+++ b/test/ARM/standalone/Map/Objects/mapfileonlyobjects.test
@@ -7,7 +7,7 @@ RUN: %link %linkopts -march arm %t1.main.o %t1.foo.o -M -o %t2.out 2>&1 | %filec
 #CHECK: Common symbol	size	file
 #CHECK: common_array	0x50	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: Linker Script and memory map
-#CHECK: .text	0x0	{{[0-9a-fx]+}}
+#CHECK: .text	{{[0-9a-fx]+}}	{{[0-9a-fx]+}}
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: 	{{[0-9a-fx]+}}  	main
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}foo.o
diff --git a/test/ARM/standalone/Map/WholeArchive/mapfilewholearchive.test b/test/ARM/standalone/Map/WholeArchive/mapfilewholearchive.test
index fb1342f51f..42ed718179 100644
--- a/test/ARM/standalone/Map/WholeArchive/mapfilewholearchive.test
+++ b/test/ARM/standalone/Map/WholeArchive/mapfilewholearchive.test
@@ -16,7 +16,7 @@ RUN: %link %linkopts -march arm %t1.main.o --whole-archive %t1.library.a -M -o %
 #CHECK: Common symbol	size	file
 #CHECK: common_array	0x50	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: Linker Script and memory map
-#CHECK: .text	0x0	{{[0-9a-fx]+}}
+#CHECK: .text	{{[0-9a-fx]+}}	{{[0-9a-fx]+}}
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}main.o
 #CHECK: 	{{[0-9a-fx]+}}  	main
 #CHECK: .text	{{[0-9a-fx]+}}  {{[0-9a-fx]+}}	{{[ -\(\)_A-Za-z0-9.\\/:]+}}foo.o
diff --git a/test/ARM/standalone/Relocs/R_ARM_THM_JUMP24/R_ARM_THM_JUMP24.test b/test/ARM/standalone/Relocs/R_ARM_THM_JUMP24/R_ARM_THM_JUMP24.test
index 352d57b533..245313d775 100644
--- a/test/ARM/standalone/Relocs/R_ARM_THM_JUMP24/R_ARM_THM_JUMP24.test
+++ b/test/ARM/standalone/Relocs/R_ARM_THM_JUMP24/R_ARM_THM_JUMP24.test
@@ -5,7 +5,7 @@
 #END_COMMENT
 #START_TEST
 RUN: %clang -c %p/Inputs/x.s -o %t1.1.o
-RUN: %link %linkopts -march arm %t1.1.o --defsym arm_callee1=1 -o %t2.out
+RUN: %link %linkopts -march arm %t1.1.o --defsym arm_callee1=1 -o %t2.out --image-base 0x0
 RUN: %objdump -d %t2.out | %filecheck %s
 
 #CHECK:  0: f7ff bffe
diff --git a/test/ARM/standalone/SymDefAddend/SymDefAddend.test b/test/ARM/standalone/SymDefAddend/SymDefAddend.test
index 8ae816fbfa..5be241486f 100644
--- a/test/ARM/standalone/SymDefAddend/SymDefAddend.test
+++ b/test/ARM/standalone/SymDefAddend/SymDefAddend.test
@@ -4,10 +4,10 @@
 #END_COMMENT
 #START_TEST
 RUN: %clang -c %p/Inputs/x.s -o %t1.1.o
-RUN: %link -march arm %t1.1.o --defsym arm_val=1 -o %t2.out
+RUN: %link -march arm %t1.1.o --defsym arm_val=1 -o %t2.out --image-base 0x0
 RUN: %objdump -s %t2.out | %filecheck %s
 
 #CHECK: Contents of section .data:
-#CHECK-NEXT: 0000 02000000
+#CHECK-NEXT: {{[0-9a-fA-F]+}} 02000000
 #END_TEST