diff --git a/asmcomp/power/emit.mlp b/asmcomp/power/emit.mlp
index 47deff1ac..a06fb5872 100644
--- a/asmcomp/power/emit.mlp
+++ b/asmcomp/power/emit.mlp
@@ -198,8 +198,11 @@ let emit_toctable () =
       `{emit_label lbl}:	.quad	{emit_tocentry entry}\n`)
     tocref_entries
 
-(* Emit a load from a TOC entry *)
+(* Emit a load from a TOC entry.
 
+   The [dest] should not be r0, since [dest] is used as the index register for a
+   ld instruction, but r0 reads as zero when used as an index register.
+*)
 let emit_tocload emit_dest dest entry =
   let lbl = label_for_tocref entry in
   if !big_toc || !Clflags.for_package <> None then begin
@@ -969,9 +972,9 @@ let emit_instr i =
         | ELF64v1 | ELF64v2 ->
           `	addi	1, 1, {emit_int (-trap_size)}\n`;
           adjust_stack_offset trap_size;
-          emit_tocload emit_gpr 0 (TocLabel lbl_handler);
-          `	std     0, {emit_int trap_handler_offset}(1)\n`;
           `	std	29, {emit_int trap_previous_offset}(1)\n`;
+          emit_tocload emit_gpr 29 (TocLabel lbl_handler);
+          `	std     29, {emit_int trap_handler_offset}(1)\n`;
           `	mr	29, 1\n`
           end
     | Lpoptrap ->
diff --git a/ocamltest/builtin_actions.ml b/ocamltest/builtin_actions.ml
index 4b1c2a32f..64af2eec1 100644
--- a/ocamltest/builtin_actions.ml
+++ b/ocamltest/builtin_actions.ml
@@ -145,6 +145,12 @@ let arch64 = make
     "64-bit architecture"
     "non-64-bit architecture")
 
+let arch_power = make
+  "arch_power"
+  (Actions_helpers.pass_or_skip (String.equal Ocamltest_config.arch "power")
+    "Target is POWER architecture"
+    "Target is not POWER architecture")
+
 let has_symlink = make
   "has_symlink"
   (Actions_helpers.pass_or_skip (Sys.has_symlink () )
@@ -208,4 +214,5 @@ let _ =
     run;
     script;
     check_program_output;
+    arch_power;
   ]
diff --git a/ocamltest/builtin_actions.mli b/ocamltest/builtin_actions.mli
index 6fbedc6bc..241270eb3 100644
--- a/ocamltest/builtin_actions.mli
+++ b/ocamltest/builtin_actions.mli
@@ -34,6 +34,9 @@ val not_bsd : Actions.t
 val arch32 : Actions.t
 val arch64 : Actions.t
 
+(** Whether the compiler target is POWER architecture. *)
+val arch_power : Actions.t
+
 val has_symlink : Actions.t
 
 val setup_build_env : Actions.t
diff --git a/testsuite/tests/arch-power/exn_raise.ml b/testsuite/tests/arch-power/exn_raise.ml
new file mode 100644
index 000000000..a68eb875e
--- /dev/null
+++ b/testsuite/tests/arch-power/exn_raise.ml
@@ -0,0 +1,19 @@
+(* TEST
+  * arch_power
+  ** native
+  *** ocamlopt.byte
+  ocamlopt_flags = "-flarge-toc"
+  **** run
+*)
+
+(* GPR#8506
+
+   This isn't guaranteed to fail even without the fix from #8506, because
+   the @ha relocation on the TOC entry for the exception handler's address
+   might be zero, in which case the linker optimises the code sequence to one
+   that will not fail.
+*)
+
+let () =
+  try failwith "foo"
+  with (Failure _) -> ()
diff --git a/testsuite/tests/arch-power/exn_raise.reference b/testsuite/tests/arch-power/exn_raise.reference
new file mode 100644
index 000000000..e69de29bb
diff --git a/testsuite/tests/arch-power/ocamltests b/testsuite/tests/arch-power/ocamltests
new file mode 100644
index 000000000..03fa29c94
--- /dev/null
+++ b/testsuite/tests/arch-power/ocamltests
@@ -0,0 +1 @@
+exn_raise.ml