diff --git a/test/Driver/mips-float.c b/test/Driver/mips-float.c
index 4a666ee..8737272 100644
--- a/test/Driver/mips-float.c
+++ b/test/Driver/mips-float.c
@@ -40,20 +40,3 @@
 // RUN:     -target mips-linux-gnu -mfloat-abi=single \
 // RUN:   | FileCheck --check-prefix=CHECK-ABI-SINGLE %s
 // CHECK-ABI-SINGLE: "-target-feature" "+single-float"
-//
-// Let's check float ABI related macros.
-//
-// -mfloat-abi=hard
-// RUN: %clang -c %s -dM -E 2>&1 \
-// RUN:     -target mips-linux-gnu -mfloat-abi=hard \
-// RUN:   | grep "#define __mips_hard_float 1"
-//
-// -mfloat-abi=soft
-// RUN: %clang -c %s -dM -E 2>&1 \
-// RUN:     -target mips-linux-gnu -mfloat-abi=soft \
-// RUN:   | grep "#define __mips_soft_float 1"
-//
-// -mfloat-abi=single
-// RUN: %clang -c %s -dM -E 2>&1 \
-// RUN:     -target mips-linux-gnu -mfloat-abi=single \
-// RUN:   | grep "#define __mips_single_float 1"
diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index ae22aaf..e0f45f1 100644
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -849,6 +849,23 @@
 // MIPS64EL:#define _mips 1
 // MIPS64EL:#define mips 1
 //
+// Check MIPS float ABI macros
+//
+// RUN: %clang_cc1 -E -dM -ffreestanding \
+// RUN:   -triple=mips-none-none < /dev/null \
+// RUN:   | FileCheck -check-prefix MIPS-FABI-HARD %s
+// MIPS-FABI-HARD:#define __mips_hard_float 1
+//
+// RUN: %clang_cc1 -target-feature +soft-float -E -dM -ffreestanding \
+// RUN:   -triple=mips-none-none < /dev/null \
+// RUN:   | FileCheck -check-prefix MIPS-FABI-SOFT %s
+// MIPS-FABI-SOFT:#define __mips_soft_float 1
+//
+// RUN: %clang_cc1 -target-feature +single-float -E -dM -ffreestanding \
+// RUN:   -triple=mips-none-none < /dev/null \
+// RUN:   | FileCheck -check-prefix MIPS-FABI-SINGLE %s
+// MIPS-FABI-SINGLE:#define __mips_single_float 1
+//
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=msp430-none-none < /dev/null | FileCheck -check-prefix MSP430 %s
 //
 // MSP430:#define MSP430 1