diff --git a/lib/instance.c b/lib/instance.c
index 0d2c26a4..b497111e 100644
--- a/lib/instance.c
+++ b/lib/instance.c
@@ -308,6 +308,10 @@ resolve_imports(struct instance *inst, const struct import_object *imports,
                 int (*check)(const struct import_object_entry *e,
                              const void *);
                 const void *type;
+#if defined(__GNUC__) && !defined(__clang__)
+                check = NULL;
+                type = NULL;
+#endif
                 switch (imd->type) {
                 case EXTERNTYPE_FUNC:
                         check = check_functype;
diff --git a/test/run-wasi-testsuite.sh b/test/run-wasi-testsuite.sh
index c94b9ab2..dd71d7cc 100755
--- a/test/run-wasi-testsuite.sh
+++ b/test/run-wasi-testsuite.sh
@@ -7,7 +7,7 @@ DIR=.wasi-testsuite
 fetch() {
     REPO=https://github.com/WebAssembly/wasi-testsuite
     # prod/testsuite-all branch
-    REF=6cbd7e21bd40ce3cf405a646956085e2a0cd344c
+    REF=eb62461cacbb856d310943e54127204d508a6688
     mkdir "${DIR}"
     git -C "${DIR}" init
     git -C "${DIR}" fetch --depth 1 ${REPO} ${REF}