diff --git a/lib/Target/Mips/MipsSubtarget.h b/lib/Target/Mips/MipsSubtarget.h
index 7c175537a72..6b2ab1238b8 100644
--- a/lib/Target/Mips/MipsSubtarget.h
+++ b/lib/Target/Mips/MipsSubtarget.h
@@ -217,7 +217,7 @@ public:
 //
 static bool useConstantIslands();
 
-  unsigned stackAlignment() const { return isFP64bit() ? 16 : 8; }
+  unsigned stackAlignment() const { return hasMips64() ? 16 : 8; }
 
   // Grab MipsRegInfo object
   const MipsReginfo &getMReginfo() const { return MRI; }
diff --git a/test/CodeGen/Mips/stack-alignment.ll b/test/CodeGen/Mips/stack-alignment.ll
index 403a10625f4..b18f96695ff 100644
--- a/test/CodeGen/Mips/stack-alignment.ll
+++ b/test/CodeGen/Mips/stack-alignment.ll
@@ -1,9 +1,8 @@
 ; RUN: llc -march=mipsel < %s | FileCheck %s -check-prefix=32
-; RUN: llc -march=mipsel -mattr=+fp64 < %s | FileCheck %s -check-prefix=32-FP64
+; RUN: llc -march=mipsel -mattr=+fp64 < %s | FileCheck %s -check-prefix=32
 ; RUN: llc -march=mips64el -mcpu=mips64 < %s | FileCheck %s -check-prefix=64
 
 ; 32:      addiu  $sp, $sp, -8
-; 32-FP64: addiu  $sp, $sp, -16
 ; 64:      addiu  $sp, $sp, -16
 
 define i32 @foo1() #0 {