diff --git a/test/CodeGen/X86/vec_set-2.ll b/test/CodeGen/X86/vec_set-2.ll
index ac8936862a1..ab15d4abbe2 100644
--- a/test/CodeGen/X86/vec_set-2.ll
+++ b/test/CodeGen/X86/vec_set-2.ll
@@ -1,23 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | count 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movd | count 1
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movss | count 1
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movd | count 1
 
-<4 x float> %test1(float %a) {
-	%tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0
-	%tmp5 = insertelement <4 x float> %tmp, float 0.000000e+00, uint 1
-	%tmp6 = insertelement <4 x float> %tmp5, float 0.000000e+00, uint 2
-	%tmp7 = insertelement <4 x float> %tmp6, float 0.000000e+00, uint 3
+define <4 x float> @test1(float %a) {
+	%tmp = insertelement <4 x float> zeroinitializer, float %a, i32 0		; <<4 x float>> [#uses=1]
+	%tmp5 = insertelement <4 x float> %tmp, float 0.000000e+00, i32 1		; <<4 x float>> [#uses=1]
+	%tmp6 = insertelement <4 x float> %tmp5, float 0.000000e+00, i32 2		; <<4 x float>> [#uses=1]
+	%tmp7 = insertelement <4 x float> %tmp6, float 0.000000e+00, i32 3		; <<4 x float>> [#uses=1]
 	ret <4 x float> %tmp7
 }
 
-<2 x long> %test(short %a) {
-	%tmp = insertelement <8 x short> zeroinitializer, short %a, uint 0
-	%tmp6 = insertelement <8 x short> %tmp, short 0, uint 1
-	%tmp8 = insertelement <8 x short> %tmp6, short 0, uint 2
-	%tmp10 = insertelement <8 x short> %tmp8, short 0, uint 3
-	%tmp12 = insertelement <8 x short> %tmp10, short 0, uint 4
-	%tmp14 = insertelement <8 x short> %tmp12, short 0, uint 5
-	%tmp16 = insertelement <8 x short> %tmp14, short 0, uint 6
-	%tmp18 = insertelement <8 x short> %tmp16, short 0, uint 7
-	%tmp19 = cast <8 x short> %tmp18 to <2 x long>
-	ret <2 x long> %tmp19
+define <2 x i64> @test(i32 %a) {
+	%tmp = insertelement <4 x i32> zeroinitializer, i32 %a, i32 0		; <<8 x i16>> [#uses=1]
+	%tmp6 = insertelement <4 x i32> %tmp, i32 0, i32 1		; <<8 x i32>> [#uses=1]
+	%tmp8 = insertelement <4 x i32> %tmp6, i32 0, i32 2		; <<8 x i32>> [#uses=1]
+	%tmp10 = insertelement <4 x i32> %tmp8, i32 0, i32 3		; <<8 x i32>> [#uses=1]
+	%tmp19 = bitcast <4 x i32> %tmp10 to <2 x i64>		; <<2 x i64>> [#uses=1]
+	ret <2 x i64> %tmp19
 }