diff --git a/test/CodeGen/Generic/2007-04-08-MultipleFrameIndices.ll b/test/CodeGen/Generic/2007-04-08-MultipleFrameIndices.ll
index 26a00cc..9cbf314 100644
--- a/test/CodeGen/Generic/2007-04-08-MultipleFrameIndices.ll
+++ b/test/CodeGen/Generic/2007-04-08-MultipleFrameIndices.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc
-; XFAIL: sparc-sun-solaris2.*
+; XFAIL: sparc-sun-solaris2
 ; PR1308
 ; PR1557
 
diff --git a/test/CodeGen/Generic/2007-04-27-InlineAsm-X-Dest.ll b/test/CodeGen/Generic/2007-04-27-InlineAsm-X-Dest.ll
index d95bc56..6f8fbae 100644
--- a/test/CodeGen/Generic/2007-04-27-InlineAsm-X-Dest.ll
+++ b/test/CodeGen/Generic/2007-04-27-InlineAsm-X-Dest.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc
-; XFAIL: sparc-sun-solaris2.*
+; XFAIL: sparc-sun-solaris2
 ; PR1557
 
 ; Test that we can have an "X" output constraint.
diff --git a/test/CodeGen/Generic/2007-04-27-LargeMemObject.ll b/test/CodeGen/Generic/2007-04-27-LargeMemObject.ll
index 9719e3d..cd72495 100644
--- a/test/CodeGen/Generic/2007-04-27-LargeMemObject.ll
+++ b/test/CodeGen/Generic/2007-04-27-LargeMemObject.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc
-; XFAIL: sparc-sun-solaris2.*
+; XFAIL: sparc-sun-solaris2
 ; PR1557
 
         %struct..0anon = type { [100 x i32] }