diff --git a/gas/testsuite/gas/riscv/dw-regnums.d b/gas/testsuite/gas/riscv/dw-regnums.d
index 5ec61b98697..57f8a01ea01 100644
--- a/gas/testsuite/gas/riscv/dw-regnums.d
+++ b/gas/testsuite/gas/riscv/dw-regnums.d
@@ -49,6 +49,7 @@ Contents of the .* section:
   DW_CFA_offset_extended_sf: r29 \(t4\) at cfa\+120
   DW_CFA_offset_extended_sf: r30 \(t5\) at cfa\+124
   DW_CFA_offset_extended_sf: r31 \(t6\) at cfa\+128
+  DW_CFA_offset_extended_sf: r8 \(s0\) at cfa\+36
   DW_CFA_offset_extended_sf: r0 \(zero\) at cfa\+4
   DW_CFA_offset_extended_sf: r1 \(ra\) at cfa\+8
   DW_CFA_offset_extended_sf: r2 \(sp\) at cfa\+12
diff --git a/gas/testsuite/gas/riscv/dw-regnums.s b/gas/testsuite/gas/riscv/dw-regnums.s
index bbe1b13d894..ed1d3ebdb3c 100644
--- a/gas/testsuite/gas/riscv/dw-regnums.s
+++ b/gas/testsuite/gas/riscv/dw-regnums.s
@@ -44,6 +44,9 @@ _start:
 	.cfi_offset t5,  124
 	.cfi_offset t6,  128
 
+	# GPR (ABI alias)
+	.cfi_offset fp,   36
+
 	# GPRs (Numeric)
 	.cfi_offset x0,    4
 	.cfi_offset x1,    8