diff --git a/External/FEXCore/unittests/Emitter/ALU_Tests.cpp b/External/FEXCore/unittests/Emitter/ALU_Tests.cpp
index be6b1ed26..6b06fa3be 100644
--- a/External/FEXCore/unittests/Emitter/ALU_Tests.cpp
+++ b/External/FEXCore/unittests/Emitter/ALU_Tests.cpp
@@ -83,6 +83,150 @@ TEST_CASE_METHOD(TestDisassembler, "Emitter: ALU: PC relative") {
 
     CHECK(DisassembleEncoding(0) == 0xb000001e);
   }
+
+  {
+    // Will generate adr.
+    BackwardLabel Label;
+    Bind(&Label);
+    dc32(0);
+
+    LongAddressGen(Reg::r30, &Label);
+    CHECK(DisassembleEncoding(1) == 0x10fffffe);
+  }
+  {
+    // Will generate nop + adr.
+    ForwardLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xd503201f);
+    CHECK(DisassembleEncoding(1) == 0x1000003e);
+  }
+  {
+    // Will generate adr.
+    BiDirectionalLabel Label;
+    Bind(&Label);
+    dc32(0);
+    LongAddressGen(Reg::r30, &Label);
+
+    CHECK(DisassembleEncoding(1) == 0x10fffffe);
+  }
+
+  {
+    // Will generate nop + adr.
+    BiDirectionalLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xd503201f);
+    CHECK(DisassembleEncoding(1) == 0x1000003e);
+  }
+
+  {
+    // Will generate adrp.
+    BackwardLabel Label;
+    Bind(&Label);
+    dc32(0);
+
+    // Move adrp 1MB away.
+    for (size_t i = 0; i < (1 * 1024 * 1024 / 4); ++i) {
+      nop();
+    }
+
+    LongAddressGen(Reg::r30, &Label);
+    nop();
+    CHECK(DisassembleEncoding(262145) == 0x90fff81e);
+    CHECK(DisassembleEncoding(262146) == 0xd503201f);
+  }
+
+  {
+    // Will generate nop + adrp.
+    ForwardLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+
+    // Move label 1MB away, plus a page, and then aligned to a page.
+    for (size_t i = 0; i < ((1 * 1024 * 1024 + 4096) / 4 - 2); ++i) {
+      nop();
+    }
+
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xd503201f);
+    CHECK(DisassembleEncoding(1) == 0x9000081e);
+  }
+
+  {
+    // Will generate adrp + add.
+    ForwardLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+
+    // Move label 1MB away, plus a page, plus one instruction.
+    for (size_t i = 0; i < ((1 * 1024 * 1024 + 4096) / 4 - 1); ++i) {
+      nop();
+    }
+
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xb000081e);
+    CHECK(DisassembleEncoding(1) == 0x910013de);
+  }
+
+
+  {
+    // Will generate adrp.
+    BiDirectionalLabel Label;
+    Bind(&Label);
+    dc32(0);
+
+    // Move adrp 1MB away.
+    for (size_t i = 0; i < (1 * 1024 * 1024 / 4); ++i) {
+      nop();
+    }
+
+    LongAddressGen(Reg::r30, &Label);
+    nop();
+    CHECK(DisassembleEncoding(262145) == 0x90fff81e);
+    CHECK(DisassembleEncoding(262146) == 0xd503201f);
+  }
+
+  {
+    // Will generate nop + adrp.
+    BiDirectionalLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+
+    // Move label 1MB away, plus a page, and then aligned to a page.
+    for (size_t i = 0; i < ((1 * 1024 * 1024 + 4096) / 4 - 2); ++i) {
+      nop();
+    }
+
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xd503201f);
+    CHECK(DisassembleEncoding(1) == 0x9000081e);
+  }
+
+  {
+    // Will generate adrp + add.
+    BiDirectionalLabel Label;
+    LongAddressGen(Reg::r30, &Label);
+
+    // Move label 1MB away, plus a page, plus one instruction.
+    for (size_t i = 0; i < ((1 * 1024 * 1024 + 4096) / 4 - 1); ++i) {
+      nop();
+    }
+
+    Bind(&Label);
+    dc32(0);
+
+    CHECK(DisassembleEncoding(0) == 0xb000081e);
+    CHECK(DisassembleEncoding(1) == 0x910013de);
+  }
+
 }
 TEST_CASE_METHOD(TestDisassembler, "Emitter: ALU: Add/subtract immediate") {
   TEST_SINGLE(add(Size::i32Bit, Reg::r29, Reg::r28, 0, false), "add w29, w28, #0x0 (0)");
diff --git a/External/FEXCore/unittests/Emitter/TestDisassembler.h b/External/FEXCore/unittests/Emitter/TestDisassembler.h
index bc7589027..9306efafd 100644
--- a/External/FEXCore/unittests/Emitter/TestDisassembler.h
+++ b/External/FEXCore/unittests/Emitter/TestDisassembler.h
@@ -12,7 +12,9 @@ public:
   TestDisassembler() {
     fp = tmpfile();
     Disasm = std::make_unique<vixl::aarch64::PrintDisassembler>(fp);
-    SetBuffer(reinterpret_cast<uint8_t*>(mmap(nullptr, 4096, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)), 4096);
+    // 2MB code size.
+    const size_t CodeSize = 2 * 1024 * 1024;
+    SetBuffer(reinterpret_cast<uint8_t*>(mmap(nullptr, CodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)), CodeSize);
     BufferBegin = GetCursorAddress<const vixl::aarch64::Instruction*>();
   }
   ~TestDisassembler() {