diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index 15ed4928a..65b55c18e 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -438,11 +438,15 @@ module Typer = struct
     then ok @@ t_int () else
     if eq_1 a (t_tez ()) && eq_1 b (t_nat ())
     then ok @@ t_tez () else
+    if eq_1 a (t_tez ()) && eq_1 b (t_tez ())
+    then ok @@ t_nat () else
       simple_fail "Dividing with wrong types"
 
   let mod_ = typer_2 "MOD" @@ fun a b ->
     if (eq_1 a (t_nat ()) || eq_1 a (t_int ())) && (eq_1 b (t_nat ()) || eq_1 b (t_int ()))
     then ok @@ t_nat () else
+    if eq_1 a (t_tez ()) && eq_1 b (t_tez ())
+    then ok @@ t_tez () else
       simple_fail "Computing modulo with wrong types"
 
   let add = typer_2 "ADD" @@ fun a b ->
diff --git a/src/test/contracts/tez.ligo b/src/test/contracts/tez.ligo
index cf487808d..cd76c47c7 100644
--- a/src/test/contracts/tez.ligo
+++ b/src/test/contracts/tez.ligo
@@ -1,4 +1,16 @@
 const add_tez : tez = 21mtz + 0.000021tz;
 const sub_tez : tez = 21mtz - 20mtz;
-(* is this enough? *)
+(* This is not enough. *)
 const not_enough_tez : tez = 4611686018427387903mtz;
+
+
+const nat_mul_tez : tez = 1n * 100mtz;
+const tez_mul_nat : tez = 100mtz * 10n;
+
+const tez_div_tez1 : nat = 100mtz / 1mtz;
+const tez_div_tez2 : nat = 100mtz / 90mtz;
+const tez_div_tez3 : nat = 100mtz / 110mtz;
+
+const tez_mod_tez1 : tez = 100mtz mod 1mtz;
+const tez_mod_tez2 : tez = 100mtz mod 90mtz;
+const tez_mod_tez3 : tez = 100mtz mod 110mtz;
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 7a50ad29b..94f0755a6 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -829,6 +829,14 @@ let tez_ligo () : unit result =
   let%bind _ = expect_eq_evaluate program "add_tez" (e_mutez 42) in
   let%bind _ = expect_eq_evaluate program "sub_tez" (e_mutez 1) in
   let%bind _ = expect_eq_evaluate program "not_enough_tez" (e_mutez 4611686018427387903) in
+  let%bind _ = expect_eq_evaluate program "nat_mul_tez" (e_mutez 100) in
+  let%bind _ = expect_eq_evaluate program "tez_mul_nat" (e_mutez 1000) in
+  let%bind _ = expect_eq_evaluate program "tez_div_tez1" (e_nat 100) in
+  let%bind _ = expect_eq_evaluate program "tez_div_tez2" (e_nat 1) in
+  let%bind _ = expect_eq_evaluate program "tez_div_tez3" (e_nat 0) in
+  let%bind _ = expect_eq_evaluate program "tez_mod_tez1" (e_mutez 0) in
+  let%bind _ = expect_eq_evaluate program "tez_mod_tez2" (e_mutez 10) in
+  let%bind _ = expect_eq_evaluate program "tez_mod_tez3" (e_mutez 100) in
   ok ()
 
 let tez_mligo () : unit result =