diff --git a/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
new file mode 100644
index 00000000000..ddfd7d10c42
--- /dev/null
+++ b/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll
@@ -0,0 +1,14 @@
+; Make sure that the constant propogator doesn't divide by zero!
+;
+; RUN: as < %s | opt -constprop
+;
+
+int "test"() {
+	%R = div int 12, 0
+	ret int %R
+}
+
+int "test2"() {
+	%R = rem int 12, 0
+	ret int %R
+}