diff --git a/test/Transforms/InstCombine/or.ll b/test/Transforms/InstCombine/or.ll
index 838e75ec1dc..9cdd7478909 100644
--- a/test/Transforms/InstCombine/or.ll
+++ b/test/Transforms/InstCombine/or.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep -v '%OROK = or' | not grep 'or '
+; RUN: as < %s | opt -instcombine | dis | grep -v xor | not grep 'or '
 
 implementation
 
@@ -30,26 +30,6 @@ bool %test4(bool %A) {
 	ret bool %B
 }
 
-bool %test5(bool %A) {
-	%B = xor bool %A, false
-	ret bool %B
-}
-
-int %test6(int %A) {
-	%B = xor int %A, 0
-	ret int %B
-}
-
-bool %test7(bool %A) {
-	%B = xor bool %A, %A
-	ret bool %B
-}
-
-int %test8(int %A) {
-	%B = xor int %A, %A
-	ret int %B
-}
-
 bool %test9(bool %A) {
 	%B = or bool %A, %A
 	ret bool %B
@@ -60,41 +40,17 @@ int %test10(int %A) {
 	ret int %B
 }
 
-int %test11(int %A) {    ; A ^ ~A == -1
-        %NotA = xor int -1, %A
-        %B = xor int %A, %NotA
-        ret int %B
-}
-
 int %test12(int %A) {    ; A | ~A == -1
         %NotA = xor int -1, %A
         %B = or int %A, %NotA
         ret int %B
 }
 
-uint %test13(uint %A) { ; (A|B)^B == A & (~B)
-	%t1 = or uint %A, 123
-	%r  = xor uint %t1, 123
-	ret uint %r
-}
-
 ubyte %test14(ubyte %A) {
 	%B = or ubyte %A, 254
 	%C = or ubyte %B, 1
 	ret ubyte %C
 }
-ubyte %test15(ubyte %A) {
-	%B = xor ubyte %A, 17
-	%C = xor ubyte %B, 17
-	ret ubyte %C
-}
-
-int %test16(int %A, int %B) {     ; (A & C1)^(B & C2) -> (A & C1)|(B & C2) iff C1&C2 == 0
-        %A1 = and int %A, 7
-        %B1 = and int %B, 128
-        %OROK = xor int %A1, %B1
-        ret int %OROK
-}
 
 ubyte %test17(ubyte %A, ubyte %B) {  ; Test that (A|c1)|(B|c2) == (A|B)|(c1|c2)
 	%C = or ubyte %A, 1
@@ -103,21 +59,6 @@ ubyte %test17(ubyte %A, ubyte %B) {  ; Test that (A|c1)|(B|c2) == (A|B)|(c1|c2)
 	ret ubyte %E
 }
 
-ubyte %test18(bool %c) {
-	%d = xor bool %c, true    ; invert the condition
-	br bool %d, label %True, label %False
-True:
-	ret ubyte 1
-False:
-	ret ubyte 3
-}
-
-bool %test19(ubyte %A) {
-	%B = xor ubyte %A, 123      ; xor can be eliminated
-	%C = seteq ubyte %B, 34
-	ret bool %C
-}
-
 ubyte %test21(ubyte %A) {
 	%B = or ubyte %A, 1
 	%C = and ubyte %B, 254
diff --git a/test/Transforms/InstCombine/xor.ll b/test/Transforms/InstCombine/xor.ll
new file mode 100644
index 00000000000..1956184a949
--- /dev/null
+++ b/test/Transforms/InstCombine/xor.ll
@@ -0,0 +1,66 @@
+; This test makes sure that these instructions are properly eliminated.
+;
+
+; RUN: as < %s | opt -instcombine | dis | not grep 'xor '
+
+implementation
+
+bool %test5(bool %A) {
+	%B = xor bool %A, false
+	ret bool %B
+}
+
+int %test6(int %A) {
+	%B = xor int %A, 0
+	ret int %B
+}
+
+bool %test7(bool %A) {
+	%B = xor bool %A, %A
+	ret bool %B
+}
+
+int %test8(int %A) {
+	%B = xor int %A, %A
+	ret int %B
+}
+
+int %test11(int %A) {    ; A ^ ~A == -1
+        %NotA = xor int -1, %A
+        %B = xor int %A, %NotA
+        ret int %B
+}
+
+uint %test13(uint %A) { ; (A|B)^B == A & (~B)
+	%t1 = or uint %A, 123
+	%r  = xor uint %t1, 123
+	ret uint %r
+}
+
+ubyte %test15(ubyte %A) {
+	%B = xor ubyte %A, 17
+	%C = xor ubyte %B, 17
+	ret ubyte %C
+}
+
+int %test16(int %A, int %B) {     ; (A & C1)^(B & C2) -> (A & C1)|(B & C2) iff C1&C2 == 0
+        %A1 = and int %A, 7
+        %B1 = and int %B, 128
+        %OROK = xor int %A1, %B1
+        ret int %OROK
+}
+
+ubyte %test18(bool %c) {
+	%d = xor bool %c, true    ; invert the condition
+	br bool %d, label %True, label %False
+True:
+	ret ubyte 1
+False:
+	ret ubyte 3
+}
+
+bool %test19(ubyte %A) {
+	%B = xor ubyte %A, 123      ; xor can be eliminated
+	%C = seteq ubyte %B, 34
+	ret bool %C
+}