diff --git a/test/CodeGen/X86/fabs.ll b/test/CodeGen/X86/fabs.ll
index fd7585bdb93..0646a7963ad 100644
--- a/test/CodeGen/X86/fabs.ll
+++ b/test/CodeGen/X86/fabs.ll
@@ -1,24 +1,29 @@
 ; Make sure this testcase codegens to the fabs instruction, not a call to fabsf
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3,-sse | \
-; RUN:   grep fabs\$ | count 1
-; RUN: llvm-upgrade < %s | llvm-as | \
-; RUN:   llc -march=x86 -mattr=-sse,-sse2,-sse3 -enable-unsafe-fp-math  | \
-; RUN:   grep fabs\$ | count 2
+; RUN: llvm-as < %s | llc -march=x86 -mattr=-sse2,-sse3,-sse | grep fabs\$ | \
+; RUN:   count 2
+; RUN: llvm-as < %s | \
+; RUN:   llc -march=x86 -mattr=-sse,-sse2,-sse3 -enable-unsafe-fp-math | \
+; RUN:   grep fabs\$ | count 3
 
-target endian = little
-target pointersize = 32
+declare float @fabsf(float)
 
-declare float %fabsf(float)
+declare x86_fp80 @fabsl(x86_fp80)
 
-float %test1(float %X) {
-        %Y = call float %fabsf(float %X)
+define float @test1(float %X) {
+        %Y = call float @fabsf(float %X)
         ret float %Y
 }
 
-double %test2(double %X) {
-        %Y = setge double %X, -0.0
+define double @test2(double %X) {
+        %Y = fcmp oge double %X, -0.0
         %Z = sub double -0.0, %X
-        %Q = select bool %Y, double %X, double %Z
+        %Q = select i1 %Y, double %X, double %Z
         ret double %Q
 }
 
+define x86_fp80 @test3(x86_fp80 %X) {
+        %Y = call x86_fp80 @fabsl(x86_fp80 %X)
+        ret x86_fp80 %Y
+}
+
+
diff --git a/test/CodeGen/X86/sincos.ll b/test/CodeGen/X86/sincos.ll
new file mode 100644
index 00000000000..27215956b64
--- /dev/null
+++ b/test/CodeGen/X86/sincos.ll
@@ -0,0 +1,50 @@
+; Make sure this testcase codegens to the sin and cos instructions, not calls
+; RUN: llvm-as < %s | \
+; RUN:   llc -march=x86 -mattr=-sse,-sse2,-sse3 -enable-unsafe-fp-math  | \
+; RUN:   grep sin\$ | count 3
+; RUN: llvm-as < %s | \
+; RUN:   llc -march=x86 -mattr=-sse,-sse2,-sse3 -enable-unsafe-fp-math  | \
+; RUN:   grep cos\$ | count 3
+
+declare float  @sinf(float)
+
+declare double @sin(double)
+
+declare x86_fp80 @sinl(x86_fp80)
+
+define float @test1(float %X) {
+        %Y = call float @sinf(float %X)
+        ret float %Y
+}
+
+define double @test2(double %X) {
+        %Y = call double @sin(double %X)
+        ret double %Y
+}
+
+define x86_fp80 @test3(x86_fp80 %X) {
+        %Y = call x86_fp80 @sinl(x86_fp80 %X)
+        ret x86_fp80 %Y
+}
+
+declare float @cosf(float)
+
+declare double @cos(double)
+
+declare x86_fp80 @cosl(x86_fp80)
+
+define float @test4(float %X) {
+        %Y = call float @cosf(float %X)
+        ret float %Y
+}
+
+define double @test5(double %X) {
+        %Y = call double @cos(double %X)
+        ret double %Y
+}
+
+define x86_fp80 @test6(x86_fp80 %X) {
+        %Y = call x86_fp80 @cosl(x86_fp80 %X)
+        ret x86_fp80 %Y
+}
+