@@ -1368,7 +1368,6 @@ int_mod(mrb_state *mrb, mrb_value x)
   }
 #endif
   a = mrb_integer(x);
-  if (a == 0) return x;
   if (mrb_integer_p(y)) {
     b = mrb_integer(y);
     if (b == 0) mrb_int_zerodiv(mrb);
 
@@ -76,9 +76,13 @@
   assert_equal 0, g
   assert_equal 0, h
   assert_equal 0, i
+  assert_raise(ZeroDivisionError) { 0%0 }
   skip unless Object.const_defined?(:Float)
   j = 1%1.0
   assert_equal 0.0, j
+  assert_equal 0.0, 0%2.5
+  assert_kind_of Float, 0%2.5
+  assert_raise(ZeroDivisionError) { 0%0.0 }
 end
 
 assert('Integer#<=>', '15.2.9.3.6') do
Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,6 @@ int_mod(mrb_state *mrb, mrb_value x)`
`1368`	`1368`	`}`
`1369`	`1369`	`#endif`
`1370`	`1370`	`a = mrb_integer(x);`
`1371`		`- if (a == 0) return x;`
`1372`	`1371`	`if (mrb_integer_p(y)) {`
`1373`	`1372`	`b = mrb_integer(y);`
`1374`	`1373`	`if (b == 0) mrb_int_zerodiv(mrb);`