diff --git a/testsuite/libffi.bhaible/bhaible.exp b/testsuite/libffi.bhaible/bhaible.exp
index 44aebc5e..d63a0ec5 100644
--- a/testsuite/libffi.bhaible/bhaible.exp
+++ b/testsuite/libffi.bhaible/bhaible.exp
@@ -40,7 +40,21 @@ if { ![string match $compiler_vendor "microsoft"] && ![string match $compiler_ve
 
 set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/test-call.c]]
 
+
+# Hack around https://github.com/emscripten-core/emscripten/issues/18607
+set should_xfail_emscripten_firsttest false
+proc check_effective_target_emscripten_firsttest { } {
+    global should_xfail_emscripten_firsttest
+    return $should_xfail_emscripten_firsttest
+}
+
+proc set_emscripten_firsttest { i } {
+    global should_xfail_emscripten_firsttest
+    set should_xfail_emscripten_firsttest [ expr { $i == 1 && [ istarget "wasm32-*-*" ] } ]
+}
+
 for {set i 1} {$i < 82} {incr i} {
+    set_emscripten_firsttest $i
     run-many-tests $tlist [format "-DDGTEST=%d %s" $i $warning_options]
 }
 
diff --git a/testsuite/libffi.bhaible/test-call.c b/testsuite/libffi.bhaible/test-call.c
index 4887e009..5d45efc5 100644
--- a/testsuite/libffi.bhaible/test-call.c
+++ b/testsuite/libffi.bhaible/test-call.c
@@ -16,6 +16,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
+// Hack around https://github.com/emscripten-core/emscripten/issues/18607
+// See handling code in bhaible.exp
+/* { dg-do run { xfail emscripten_firsttest } } */
 /* { dg-do run { xfail gccbug } } */
 
 #include <stdio.h>