diff --git a/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx b/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
new file mode 100644
index 00000000000..1ed6054c21b
--- /dev/null
+++ b/test/Transforms/InstCombine/2004-08-09-RemInfLoop.llx
@@ -0,0 +1,8 @@
+; RUN: llvm-as < %s | opt -instcombine
+
+; This testcase should not send the instcombiner into an infinite loop!
+
+int %test(int %X) {
+	%Y = rem int %X, 0
+	ret int %Y
+}