diff --git a/gdb/testsuite/gdb.rocm/names.exp b/gdb/testsuite/gdb.rocm/names.exp
index b18c1ac2f53..44b05438817 100644
--- a/gdb/testsuite/gdb.rocm/names.exp
+++ b/gdb/testsuite/gdb.rocm/names.exp
@@ -21,7 +21,10 @@ require allow_hipcc_tests
 
 standard_testfile .cpp
 
-if {[build_executable "failed to prepare" $testfile $srcfile {debug hip}]} {
+# Optimize: at -O0 the kernels use scratch memory, which limits GPU
+# concurrency below what wait_all_kernels needs and causes a deadlock.
+if {[build_executable "failed to prepare" $testfile $srcfile \
+	 {debug hip optimize=-O2}]} {
     return
 }
 
@@ -69,7 +72,7 @@ set all_kernels_info {
     {long_kernel_name_0123456789                  long_kernel-0245 {long_kernel_name_0123456789 ()}}
     {long_kernel_name_abcdefghijklmnopqrstuvwxyz  long_kernel-479c {long_kernel_name_abcdefghijklmnopqrstuvwxyz ()}}
     {templ_non_type                               templ_non_type   {templ_non_type<(E)0> ()}}
-    {templ_type                                   templ_type       {templ_type<int, long> (args=1, args=2)}}
+    {templ_type                                   templ_type       {templ_type<int, long> (args=<optimized out>, args=<optimized out>)}}
 }
 
 # By default, the runtime allows 4 hardware queues max, which limits