diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0cae3181d8..7c24f66b91 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-12  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/disasm-optim.exp: Require is_amd64_regs_target.
+
 2021-01-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/debug-expr.exp: Add new tests.
diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp
index 9acbbe86f1..ebb0d1f35f 100644
--- a/gdb/testsuite/gdb.base/disasm-optim.exp
+++ b/gdb/testsuite/gdb.base/disasm-optim.exp
@@ -15,7 +15,7 @@
 
 # This test exercises disassemble /s with optimized and inlined code.
 
-if { ![istarget "x86_64-*-linux*"] } {
+if { ![is_amd64_regs_target] } {
     continue
 }