diff --git a/.gitignore b/.gitignore
index 0b8c0ecda..fb5c45a23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 /tests/test-divr_f
 /tests/test-qdivr
 /tests/test-qdivr_u
+/tests/test-remr
+/tests/test-remr_u
diff --git a/tests/test-remr.c b/tests/test-remr.c
new file mode 100644
index 000000000..a06e2407f
--- /dev/null
+++ b/tests/test-remr.c
@@ -0,0 +1,63 @@
+#include "test.h"
+
+static void
+run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
+{
+  jit_begin(j, arena_base, arena_size);
+
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_INTMAX, JIT_ARG_ABI_INTMAX };
+  jit_arg_t args[2];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_R0 }, { .gpr=JIT_R1 }};
+
+  jit_receive(j, 2, abi, args);
+  jit_load_args(j, 2, abi, args, regs);
+
+  jit_remr(j, JIT_R0, JIT_R0, JIT_R1);
+  jit_retr(j, JIT_R0);
+
+  size_t size = 0;
+  void* ret = jit_end(j, &size);
+
+  intmax_t (*f)(intmax_t, intmax_t) = ret;
+
+  ASSERT(f(0x7fffffff, 1) == 0);
+  ASSERT(f(1, 0x7fffffff) == 1);
+  ASSERT(f(0x80000000, 1) == 0);
+  ASSERT(f(1, 0x80000000) == 1);
+  ASSERT(f(0x7fffffff, 2) == 1);
+  ASSERT(f(2, 0x7fffffff) == 2);
+  ASSERT(f(0x80000000, 2) == 0);
+  ASSERT(f(2, 0x80000000) == 2);
+  ASSERT(f(0x7fffffff, 0x80000000) == 0x7fffffff);
+  ASSERT(f(0, 0x7fffffff) == 0);
+  ASSERT(f(0xffffffff, 0xffffffff) == 0);
+
+#if __WORDSIZE == 32
+  ASSERT(f(0x80000000, 0x7fffffff) == 0xffffffff);
+  ASSERT(f(0x7fffffff, 0xffffffff) == 0);
+  ASSERT(f(0xffffffff, 0x7fffffff) == 0xffffffff);
+#else
+  ASSERT(f(0x80000000, 0x7fffffff) == 1);
+  ASSERT(f(0x7fffffff, 0xffffffff) == 0x7fffffff);
+  ASSERT(f(0xffffffff, 0x7fffffff) == 1);
+  ASSERT(f(0x7fffffffffffffff, 1) == 0);
+  ASSERT(f(1, 0x7fffffffffffffff) == 1);
+  ASSERT(f(0x8000000000000000, 1) == 0);
+  ASSERT(f(1, 0x8000000000000000) == 1);
+  ASSERT(f(0x7fffffffffffffff, 2) == 1);
+  ASSERT(f(2, 0x7fffffffffffffff) == 2);
+  ASSERT(f(0x8000000000000000, 2) == 0);
+  ASSERT(f(2, 0x8000000000000000) == 2);
+  ASSERT(f(0x7fffffffffffffff, 0x8000000000000000) == 0x7fffffffffffffff);
+  ASSERT(f(0x8000000000000000, 0x7fffffffffffffff) == 0xffffffffffffffff);
+  ASSERT(f(0x7fffffffffffffff, 0xffffffffffffffff) == 0);
+  ASSERT(f(0xffffffffffffffff, 0x7fffffffffffffff) == 0xffffffffffffffff);
+  ASSERT(f(0xffffffffffffffff, 0xffffffffffffffff) == 0);
+#endif
+}
+
+int
+main (int argc, char *argv[])
+{
+  return main_helper(argc, argv, run_test);
+}
diff --git a/tests/test-remr_u.c b/tests/test-remr_u.c
new file mode 100644
index 000000000..025018142
--- /dev/null
+++ b/tests/test-remr_u.c
@@ -0,0 +1,59 @@
+#include "test.h"
+
+static void
+run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
+{
+  jit_begin(j, arena_base, arena_size);
+
+  const jit_arg_abi_t abi[] = { JIT_ARG_ABI_INTMAX, JIT_ARG_ABI_INTMAX };
+  jit_arg_t args[2];
+  const jit_anyreg_t regs[] = { { .gpr=JIT_R0 }, { .gpr=JIT_R1 }};
+
+  jit_receive(j, 2, abi, args);
+  jit_load_args(j, 2, abi, args, regs);
+
+  jit_remr_u(j, JIT_R0, JIT_R0, JIT_R1);
+  jit_retr(j, JIT_R0);
+
+  size_t size = 0;
+  void* ret = jit_end(j, &size);
+
+  intmax_t (*f)(intmax_t, intmax_t) = ret;
+
+  ASSERT(f(0x7fffffff, 1) == 0);
+  ASSERT(f(1, 0x7fffffff) == 1);
+  ASSERT(f(0x80000000, 1) == 0);
+  ASSERT(f(1, 0x80000000) == 1);
+  ASSERT(f(0x7fffffff, 2) == 1);
+  ASSERT(f(2, 0x7fffffff) == 2);
+  ASSERT(f(0x80000000, 2) == 0);
+  ASSERT(f(2, 0x80000000) == 2);
+  ASSERT(f(0x7fffffff, 0x80000000) == 0x7fffffff);
+  ASSERT(f(0x80000000, 0x7fffffff) == 1);
+  ASSERT(f(0, 0x7fffffff) == 0);
+  ASSERT(f(0x7fffffff, 0xffffffff) == 0x7fffffff);
+  ASSERT(f(0xffffffff, 0x7fffffff) == 1);
+  ASSERT(f(0xffffffff, 0xffffffff) == 0);
+
+#if __WORDSIZE != 32
+  ASSERT(f(0x7fffffffffffffff, 1) == 0);
+  ASSERT(f(1, 0x7fffffffffffffff) == 1);
+  ASSERT(f(0x8000000000000000, 1) == 0);
+  ASSERT(f(1, 0x8000000000000000) == 1);
+  ASSERT(f(0x7fffffffffffffff, 2) == 1);
+  ASSERT(f(2, 0x7fffffffffffffff) == 2);
+  ASSERT(f(0x8000000000000000, 2) == 0);
+  ASSERT(f(2, 0x8000000000000000) == 2);
+  ASSERT(f(0x7fffffffffffffff, 0x8000000000000000) == 0x7fffffffffffffff);
+  ASSERT(f(0x8000000000000000, 0x7fffffffffffffff) == 1);
+  ASSERT(f(0x7fffffffffffffff, 0xffffffffffffffff) == 0x7fffffffffffffff);
+  ASSERT(f(0xffffffffffffffff, 0x7fffffffffffffff) == 1);
+  ASSERT(f(0xffffffffffffffff, 0xffffffffffffffff) == 0);
+#endif
+}
+
+int
+main (int argc, char *argv[])
+{
+  return main_helper(argc, argv, run_test);
+}