diff --git a/test/CodeGen/X86/rem.ll b/test/CodeGen/X86/rem.ll
new file mode 100644
index 00000000000..905b1423939
--- /dev/null
+++ b/test/CodeGen/X86/rem.ll
@@ -0,0 +1,23 @@
+; RUN: llvm-as < %s | llc -march=x86 &&
+; RUN: llvm-as < %s | llc -march=x86 | not grep div
+
+int %test1(int %X) {
+        %tmp1 = rem int %X, 255
+        ret int %tmp1
+}
+
+int %test2(int %X) {
+        %tmp1 = rem int %X, 256 
+        ret int %tmp1
+}
+
+uint %test3(uint %X) {
+        %tmp1 = rem uint %X, 255
+        ret uint %tmp1
+}
+
+uint %test4(uint %X) {
+        %tmp1 = rem uint %X, 256  ; just an and
+        ret uint %tmp1
+}
+