diff --git a/test/CodeGen/Alpha/ctlz.ll b/test/CodeGen/Alpha/ctlz.ll
index ad03e911f9b..390825ce1b0 100644
--- a/test/CodeGen/Alpha/ctlz.ll
+++ b/test/CodeGen/Alpha/ctlz.ll
@@ -1,6 +1,5 @@
 ; Make sure this testcase codegens to the ctlz instruction
-; XFAIL: *
-; RUN: llvm-as < %s | llc -march=alpha -enable-alpha-CT | grep 'ctlz'
+; RUN: llvm-as < %s | llc -march=alpha -enable-alpha-CT | grep -i 'ctlz'
 
 declare ubyte %llvm.ctlz(ubyte)
 
diff --git a/test/CodeGen/Alpha/ctpop.ll b/test/CodeGen/Alpha/ctpop.ll
index 681c288cffa..5c84a2cb5c9 100644
--- a/test/CodeGen/Alpha/ctpop.ll
+++ b/test/CodeGen/Alpha/ctpop.ll
@@ -1,6 +1,6 @@
 ; Make sure this testcase codegens to the ctpop instruction
 ; XFAIL: *
-; RUN: llvm-as < %s | llc -march=alpha -enable-alpha-CT | grep 'ctpop'
+; RUN: llvm-as < %s | llc -march=alpha -enable-alpha-CT | grep -i 'ctpop'
 
 declare long %llvm.ctpop(long)
 
diff --git a/test/CodeGen/Alpha/neg1.ll b/test/CodeGen/Alpha/neg1.ll
index ebf2ac4fd65..b8f7d69ee5d 100644
--- a/test/CodeGen/Alpha/neg1.ll
+++ b/test/CodeGen/Alpha/neg1.ll
@@ -1,6 +1,5 @@
 ; Make sure this testcase codegens to the lda -1 instruction
-; XFAIL: *
-; RUN: llvm-as < %s | llc -march=alpha | grep '-1'
+; RUN: llvm-as < %s | llc -march=alpha | grep '\-1'
 
 implementation   ; Functions:
 
diff --git a/test/CodeGen/Alpha/s4addq.ll b/test/CodeGen/Alpha/s4addq.ll
index 156b110584a..7f6ed5c85e9 100644
--- a/test/CodeGen/Alpha/s4addq.ll
+++ b/test/CodeGen/Alpha/s4addq.ll
@@ -1,12 +1,11 @@
 ; Make sure this testcase codegens to the S4ADDQ instruction
-; XFAIL: *
 ; RUN: llvm-as < %s | llc -march=alpha | grep 's4addq'
 
 implementation   ; Functions:
 
 long %bar(long %x, long %y) {
 entry:
-	%tmp.1 = shl long %x, ubyte 3		; <long> [#uses=1]
+	%tmp.1 = shl long %x, ubyte 2		; <long> [#uses=1]
 	%tmp.3 = add long %tmp.1, %y		; <long> [#uses=1]
 	ret long %tmp.3
 }