diff --git a/test/CodeGen/ARM/long-setcc.ll b/test/CodeGen/ARM/long-setcc.ll
new file mode 100644
index 00000000000..e9732be2c00
--- /dev/null
+++ b/test/CodeGen/ARM/long-setcc.ll
@@ -0,0 +1,20 @@
+; RUN: llvm-as < %s | llc -march=arm &&
+; RUN: llvm-as < %s | llc -march=arm | grep cmp | wc -l | grep 2 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep cmp | wc -l | grep 2
+
+
+define i1 @t1(i64 %x) {
+	%B = icmp slt i64 %x, 0
+	ret i1 %B
+}
+
+define i1 @t2(i64 %x) {
+	%tmp = icmp ult i64 %x, 4294967296
+	ret i1 %tmp
+}
+
+define i1 @t3(i32 %x) {
+	%tmp = icmp ugt i32 %x, -1
+	ret i1 %tmp
+}
diff --git a/test/CodeGen/X86/2006-01-30-LongSetcc.ll b/test/CodeGen/X86/2006-01-30-LongSetcc.ll
deleted file mode 100644
index 2195645f7f1..00000000000
--- a/test/CodeGen/X86/2006-01-30-LongSetcc.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86
-
-bool %test(long %X) {
-	%B = setlt long %X, 0		; <bool> [#uses=1]
-	ret bool %B
-}
diff --git a/test/CodeGen/X86/long-setcc.ll b/test/CodeGen/X86/long-setcc.ll
new file mode 100644
index 00000000000..1731237db90
--- /dev/null
+++ b/test/CodeGen/X86/long-setcc.ll
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc -march=x86 &&
+; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 2 &&
+; RUN: llvm-as < %s | llc -march=x86 | grep xor | wc -l | grep 1
+
+define i1 @t1(i64 %x) {
+	%B = icmp slt i64 %x, 0
+	ret i1 %B
+}
+
+define i1 @t2(i64 %x) {
+	%tmp = icmp ult i64 %x, 4294967296
+	ret i1 %tmp
+}
+
+define i1 @t3(i32 %x) {
+	%tmp = icmp ugt i32 %x, -1
+	ret i1 %tmp
+}