diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index afdd887c72b..a22e014b45a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-10  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.arch/amd64-osabi.exp (test_osabi_none): Use the
+	parameters.
+
 2021-05-07  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.guile/guile.exp: Add an extra test.
diff --git a/gdb/testsuite/gdb.arch/amd64-osabi.exp b/gdb/testsuite/gdb.arch/amd64-osabi.exp
index 0c435893bfd..151fa35e8e4 100644
--- a/gdb/testsuite/gdb.arch/amd64-osabi.exp
+++ b/gdb/testsuite/gdb.arch/amd64-osabi.exp
@@ -24,10 +24,10 @@ if { ![istarget x86_64-*-* ] } {
 proc test_osabi_none { arch void_ptr_size long_double_size } {
     clean_restart
 
-    gdb_test "set architecture i386:x86-64" "The target architecture is set to \"i386:x86-64\"\\."
+    gdb_test "set architecture $arch" "The target architecture is set to \"$arch\"\\."
     gdb_test_no_output "set osabi none" "set osabi none"
-    gdb_test "print sizeof (void*)" " = 8"
-    gdb_test "print sizeof (long double)" " = 16"
+    gdb_test "print sizeof (void*)" " = $void_ptr_size"
+    gdb_test "print sizeof (long double)" " = $long_double_size"
 }
 
 set infos { \