diff --git a/test/CodeGen/ARM/build-attributes.ll b/test/CodeGen/ARM/build-attributes.ll
index ce7a31f3dc5..1b735a6c278 100644
--- a/test/CodeGen/ARM/build-attributes.ll
+++ b/test/CodeGen/ARM/build-attributes.ll
@@ -1,6 +1,7 @@
 ; This tests that MC/asm header conversion is smooth and that the
 ; build attributes are correct
 
+; RUN: llc < %s -mtriple=thumbv5-linux-gnueabi -mcpu=xscale | FileCheck %s --check-prefix=XSCALE
 ; RUN: llc < %s -mtriple=armv6-linux-gnueabi | FileCheck %s --check-prefix=V6
 ; RUN: llc < %s -mtriple=thumbv6m-linux-gnueabi | FileCheck %s --check-prefix=V6M
 ; RUN: llc < %s -mtriple=armv6-linux-gnueabi -mcpu=arm1156t2f-s | FileCheck %s --check-prefix=ARM1156T2F-S
@@ -32,6 +33,10 @@
 ; RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mcpu=cortex-a7 -mattr=+vfp4,-neon | FileCheck %s --check-prefix=CORTEX-A7-FPUV4
 ; RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mcpu=cortex-a7 -mattr=+vfp4,,+d16,-neon | FileCheck %s --check-prefix=CORTEX-A7-FPUV4
 
+; XSCALE:      .eabi_attribute 6, 5
+; XSCALE:      .eabi_attribute 8, 1
+; XSCALE:      .eabi_attribute 9, 1
+
 ; V6:   .eabi_attribute 6, 6
 ; V6:   .eabi_attribute 8, 1
 ; V6:   .eabi_attribute 24, 1
diff --git a/test/MC/ARM/xscale-attributes.ll b/test/MC/ARM/xscale-attributes.ll
deleted file mode 100644
index 718fd8fcc78..00000000000
--- a/test/MC/ARM/xscale-attributes.ll
+++ /dev/null
@@ -1,39 +0,0 @@
-; RUN: llc %s -mtriple=thumbv5-linux-gnueabi -mcpu=xscale -o - | \
-; RUN: FileCheck -check-prefix=ASM %s
-
-; RUN: llc %s -mtriple=thumbv5-linux-gnueabi -filetype=obj \
-; RUN: -mcpu=xscale -o - | llvm-readobj -s -sd | \
-; RUN: FileCheck -check-prefix=OBJ %s
-
-; FIXME: The OBJ test should be a .s to .o test and the ASM test should
-; be moved to test/CodeGen/ARM.
-
-define void @foo() nounwind {
-entry:
-  ret void
-}
-
-; ASM:           .eabi_attribute 6, 5
-; ASM-NEXT:      .eabi_attribute 8, 1
-; ASM-NEXT:      .eabi_attribute 9, 1
-
-; OBJ:      Sections [
-; OBJ:        Section {
-; OBJ:          Index: 4
-; OBJ-NEXT:     Name: .ARM.attributes (12)
-; OBJ-NEXT:     Type: SHT_ARM_ATTRIBUTES
-; OBJ-NEXT:     Flags [ (0x0)
-; OBJ-NEXT:     ]
-; OBJ-NEXT:     Address: 0x0
-; OBJ-NEXT:     Offset: 0x38
-; OBJ-NEXT:     Size: 40
-; OBJ-NEXT:     Link: 0
-; OBJ-NEXT:     Info: 0
-; OBJ-NEXT:     AddressAlignment: 1
-; OBJ-NEXT:     EntrySize: 0
-; OBJ-NEXT:     SectionData (
-; OBJ-NEXT:       0000: 41270000 00616561 62690001 1D000000
-; OBJ-NEXT:       0010: 05585343 414C4500 06050801 09011401
-; OBJ-NEXT:       0020: 15011703 18011901
-; OBJ-NEXT:     )
-; OBJ-NEXT:   }