diff --git a/test/Transforms/InstCombine/shuffle.ll b/test/Transforms/InstCombine/shuffle.ll
deleted file mode 100644
index 2e7af908563..00000000000
--- a/test/Transforms/InstCombine/shuffle.ll
+++ /dev/null
@@ -1,17 +0,0 @@
-; RUN: opt < %s -instcombine -S | FileCheck %s
-
-; This should turn into a single shuffle.
-define <4 x float> @test1(<4 x float> %tmp, <4 x float> %tmp1) {
-; CHECK: @test1
-; CHECK-NEXT: shufflevector
-; CHECK-NEXT: ret
-        %tmp4 = extractelement <4 x float> %tmp, i32 1
-        %tmp2 = extractelement <4 x float> %tmp, i32 3
-        %tmp1.upgrd.1 = extractelement <4 x float> %tmp1, i32 0
-        %tmp128 = insertelement <4 x float> undef, float %tmp4, i32 0
-        %tmp130 = insertelement <4 x float> %tmp128, float undef, i32 1
-        %tmp132 = insertelement <4 x float> %tmp130, float %tmp2, i32 2 
-        %tmp134 = insertelement <4 x float> %tmp132, float %tmp1.upgrd.1, i32 3
-        ret <4 x float> %tmp134
-}
-
diff --git a/test/Transforms/InstCombine/vec_shuffle.ll b/test/Transforms/InstCombine/vec_shuffle.ll
index 0a096d49c0d..8c35154aeb4 100644
--- a/test/Transforms/InstCombine/vec_shuffle.ll
+++ b/test/Transforms/InstCombine/vec_shuffle.ll
@@ -1,20 +1,25 @@
-; RUN: opt < %s -instcombine -S | not grep vector_shuffle
-; END.
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 %T = type <4 x float>
 
 
 define %T @test1(%T %v1) {
+; CHECK: @test1
+; CHECK: ret %T %v1
   %v2 = shufflevector %T %v1, %T undef, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
   ret %T %v2
 }
 
 define %T @test2(%T %v1) {
+; CHECK: @test2
+; CHECK: ret %T %v1
   %v2 = shufflevector %T %v1, %T %v1, <4 x i32> <i32 0, i32 5, i32 2, i32 7>
   ret %T %v2
 }
 
 define float @test3(%T %A, %T %B, float %f) {
+; CHECK: @test3
+; CHECK: ret float %f
         %C = insertelement %T %A, float %f, i32 0
         %D = shufflevector %T %C, %T %B, <4 x i32> <i32 5, i32 0, i32 2, i32 7>
         %E = extractelement %T %D, i32 1
@@ -22,18 +27,27 @@ define float @test3(%T %A, %T %B, float %f) {
 }
 
 define i32 @test4(<4 x i32> %X) {
+; CHECK: @test4
+; CHECK-NEXT: extractelement
+; CHECK-NEXT: ret 
         %tmp152.i53899.i = shufflevector <4 x i32> %X, <4 x i32> undef, <4 x i32> zeroinitializer
         %tmp34 = extractelement <4 x i32> %tmp152.i53899.i, i32 0
         ret i32 %tmp34
 }
 
 define i32 @test5(<4 x i32> %X) {
+; CHECK: @test5
+; CHECK-NEXT: extractelement
+; CHECK-NEXT: ret 
         %tmp152.i53899.i = shufflevector <4 x i32> %X, <4 x i32> undef, <4 x i32> <i32 3, i32 2, i32 undef, i32 undef>
         %tmp34 = extractelement <4 x i32> %tmp152.i53899.i, i32 0
         ret i32 %tmp34
 }
 
 define float @test6(<4 x float> %X) {
+; CHECK: @test6
+; CHECK-NEXT: extractelement
+; CHECK-NEXT: ret 
         %X1 = bitcast <4 x float> %X to <4 x i32>
         %tmp152.i53899.i = shufflevector <4 x i32> %X1, <4 x i32> undef, <4 x i32> zeroinitializer
         %tmp152.i53900.i = bitcast <4 x i32> %tmp152.i53899.i to <4 x float>
@@ -42,6 +56,24 @@ define float @test6(<4 x float> %X) {
 }
 
 define <4 x float> @test7(<4 x float> %tmp45.i) {
+; CHECK: @test7
+; CHECK-NEXT: ret %T %tmp45.i
         %tmp1642.i = shufflevector <4 x float> %tmp45.i, <4 x float> undef, <4 x i32> < i32 0, i32 1, i32 6, i32 7 >
         ret <4 x float> %tmp1642.i
 }
+
+; This should turn into a single shuffle.
+define <4 x float> @test8(<4 x float> %tmp, <4 x float> %tmp1) {
+; CHECK: @test8
+; CHECK-NEXT: shufflevector
+; CHECK-NEXT: ret
+        %tmp4 = extractelement <4 x float> %tmp, i32 1
+        %tmp2 = extractelement <4 x float> %tmp, i32 3
+        %tmp1.upgrd.1 = extractelement <4 x float> %tmp1, i32 0
+        %tmp128 = insertelement <4 x float> undef, float %tmp4, i32 0
+        %tmp130 = insertelement <4 x float> %tmp128, float undef, i32 1
+        %tmp132 = insertelement <4 x float> %tmp130, float %tmp2, i32 2 
+        %tmp134 = insertelement <4 x float> %tmp132, float %tmp1.upgrd.1, i32 3
+        ret <4 x float> %tmp134
+}
+