diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 761fb7334c2..d6db46916e6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/watchpoint-unaligned.exp: Use skip_hw_watchpoint_tests.
+
 2018-05-04  Tom Tromey  <tom@tromey.com>
 
 	PR python/22730:
diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
index 6bdd4b6d05e..66358f27475 100644
--- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
@@ -17,6 +17,10 @@
 
 # Test inserting read watchpoints on unaligned addresses.
 
+if {[skip_hw_watchpoint_tests]} {
+    return 0
+}
+
 standard_testfile
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1