diff --git a/testsuite/libffi.bhaible/bhaible.exp b/testsuite/libffi.bhaible/bhaible.exp
index 214a666..67a0979 100644
--- a/testsuite/libffi.bhaible/bhaible.exp
+++ b/testsuite/libffi.bhaible/bhaible.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006, 2009, 2010, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2009, 2010, 2014, 2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,17 +18,24 @@
 libffi-init
 
 global srcdir subdir
+global compiler_vendor
+
+if { [string match $compiler_vendor "gnu"] } {
+    set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-uninitialized";
+} else {
+    set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-uninitialized";
+}
 
 set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/test-call.c]]
 
 for {set i 1} {$i < 82} {incr i} {
-    run-many-tests $tlist [format "-DTEST%02d -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-uninitialized" $i]
+    run-many-tests $tlist [format "-DTEST%02d %s" $i $warning_options]
 }
 
 set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/test-callback.c]]
 
 for {set i 1} {$i < 73} {incr i} {
-    run-many-tests $tlist [format "-DTEST%02d -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable" $i]
+    run-many-tests $tlist [format "-DTEST%02d %s" $i $warning_options]
 }
 
 dg-finish