diff --git a/tests/unit/test_arm64.c b/tests/unit/test_arm64.c
index 2a879c4e..f4693a95 100644
--- a/tests/unit/test_arm64.c
+++ b/tests/unit/test_arm64.c
@@ -195,10 +195,98 @@ static void test_arm64_mrs_hook(void)
     OK(uc_close(uc));
 }
 
+
+static void test_arm64_correct_address_in_small_jump_hook_callback(uc_engine *uc, int type, uint64_t address, int size, int64_t value, void *user_data)
+{
+  // Check registers
+  uint64_t r_x0 = 0x0;
+  uint64_t r_pc = 0x0;
+  OK(uc_reg_read(uc, UC_ARM64_REG_X0, &r_x0));
+  OK(uc_reg_read(uc, UC_ARM64_REG_PC, &r_pc));
+  TEST_CHECK(r_x0 == 0x7F00);
+  TEST_CHECK(r_pc == 0x7F00);
+
+  // Check address
+  // printf("%lx\n", address);
+  TEST_CHECK(address == 0x7F00);
+}
+
+static void test_arm64_correct_address_in_small_jump_hook(void)
+{
+    uc_engine *uc;
+    // mov x0, 0x7F00;
+    // br x0
+    char code[] = "\x00\xe0\x8f\xd2\x00\x00\x1f\xd6";
+
+    uint64_t r_x0 = 0x0;
+    uint64_t r_pc = 0x0;
+    uc_hook hook;
+
+    uc_common_setup(&uc, UC_ARCH_ARM64, UC_MODE_ARM, code, sizeof(code) - 1, UC_CPU_ARM64_A72);
+    OK(uc_hook_add(uc, &hook, UC_HOOK_MEM_UNMAPPED, test_arm64_correct_address_in_small_jump_hook_callback, NULL, 1, 0));
+
+    uc_assert_err(
+        UC_ERR_FETCH_UNMAPPED,
+        uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
+
+    OK(uc_reg_read(uc, UC_ARM64_REG_X0, &r_x0));
+    OK(uc_reg_read(uc, UC_ARM64_REG_PC, &r_pc));
+    TEST_CHECK(r_x0 == 0x7F00);
+    TEST_CHECK(r_pc == 0x7F00);
+
+    OK(uc_close(uc));
+}
+
+static void test_arm64_correct_address_in_long_jump_hook_callback(uc_engine *uc, int type, uint64_t address, int size, int64_t value, void *user_data)
+{
+  // Check registers
+  uint64_t r_x0 = 0x0;
+  uint64_t r_pc = 0x0;
+  OK(uc_reg_read(uc, UC_ARM64_REG_X0, &r_x0));
+  OK(uc_reg_read(uc, UC_ARM64_REG_PC, &r_pc));
+  TEST_CHECK(r_x0 == 0x7FFFFFFFFFFFFF00);
+  TEST_CHECK(r_pc == 0x7FFFFFFFFFFFFF00);
+
+  // Check address
+  // printf("%lx\n", address);
+  TEST_CHECK(address == 0x7FFFFFFFFFFFFF00);
+}
+
+static void test_arm64_correct_address_in_long_jump_hook(void)
+{
+    uc_engine *uc;
+    // mov x0, 0x7FFFFFFFFFFFFF00;
+    // br x0
+    char code[] = "\xe0\xdb\x78\xb2\x00\x00\x1f\xd6";
+
+    uint64_t r_x0 = 0x0;
+    uint64_t r_pc = 0x0;
+    uc_hook hook;
+
+    uc_common_setup(&uc, UC_ARCH_ARM64, UC_MODE_ARM, code, sizeof(code) - 1, UC_CPU_ARM64_A72);
+    OK(uc_hook_add(uc, &hook, UC_HOOK_MEM_UNMAPPED, test_arm64_correct_address_in_long_jump_hook_callback, NULL, 1, 0));
+
+    uc_assert_err(
+        UC_ERR_FETCH_UNMAPPED,
+        uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
+
+    OK(uc_reg_read(uc, UC_ARM64_REG_X0, &r_x0));
+    OK(uc_reg_read(uc, UC_ARM64_REG_PC, &r_pc));
+    TEST_CHECK(r_x0 == 0x7FFFFFFFFFFFFF00);
+    TEST_CHECK(r_pc == 0x7FFFFFFFFFFFFF00);
+
+    OK(uc_close(uc));
+}
+
+
+
+
 TEST_LIST = {{"test_arm64_until", test_arm64_until},
              {"test_arm64_code_patching", test_arm64_code_patching},
              {"test_arm64_code_patching_count", test_arm64_code_patching_count},
              {"test_arm64_v8_pac", test_arm64_v8_pac},
              {"test_arm64_read_sctlr", test_arm64_read_sctlr},
              {"test_arm64_mrs_hook", test_arm64_mrs_hook},
+             {"test_arm64_correct_address_in_small_jump_hook", test_arm64_correct_address_in_small_jump_hook},
+             {"test_arm64_correct_address_in_long_jump_hook", test_arm64_correct_address_in_long_jump_hook},
              {NULL, NULL}};