diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 90f245dd319..590adb28c9a 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-07  Martin Jambor  <mjambor@suse.cz>
+
+	* testsuite/lib/libgomp.exp (libgomp_init): Append -Wno-hsa to
+	ALWAYS_CFLAGS.
+
 2016-03-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgomp/69555
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 154a4476954..bbc2c260831 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -237,6 +237,9 @@ proc libgomp_init { args } {
     # Disable caret
     lappend ALWAYS_CFLAGS "additional_flags=-fno-diagnostics-show-caret"
 
+    # Disable HSA warnings by default.
+    lappend ALWAYS_CFLAGS "additional_flags=-Wno-hsa"
+
     # Disable color diagnostics
     lappend ALWAYS_CFLAGS "additional_flags=-fdiagnostics-color=never"