diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e5d303c792..ff54199504 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-14  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.dwarf2/var-access.exp: Use register name ecx instead of edx
+	on 32-bit x86 targets.  Exploit is_*_target macros where
+	appropriate.
+
 2017-06-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.dwarf2/var-access.exp: Add test for non-byte-aligned
diff --git a/gdb/testsuite/gdb.dwarf2/var-access.exp b/gdb/testsuite/gdb.dwarf2/var-access.exp
index 07516fc8e3..8ebad6a1f5 100644
--- a/gdb/testsuite/gdb.dwarf2/var-access.exp
+++ b/gdb/testsuite/gdb.dwarf2/var-access.exp
@@ -28,16 +28,16 @@ if {![dwarf2_support]} {
 
 set dwarf_regnum {0 1}
 
-if { [istarget "aarch64*-*-*"] } {
+if { [is_aarch64_target] } {
     set regname {x0 x1}
-} elseif { [istarget "arm*-*-*"]
+} elseif { [is_aarch32_target]
 	   || [istarget "s390*-*-*" ]
 	   || [istarget "powerpc*-*-*"]
 	   || [istarget "rs6000*-*-aix*"] } {
     set regname {r0 r1}
-} elseif { [istarget "i?86-*-*"] } {
-    set regname {eax edx}
-} elseif { [istarget "x86_64-*-*"] } {
+} elseif { [is_x86_like_target] } {
+    set regname {eax ecx}
+} elseif { [is_amd64_regs_target] } {
     set regname {rax rdx}
 } else {
     verbose "Skipping tests for accessing DWARF-described variables."