diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java
index 8cf3c3790..c0005c9b0 100644
--- a/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java
@@ -106,7 +106,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void available() throws Exception {
         pis = new PipedInputStream();
         pos = new PipedOutputStream();
@@ -133,7 +133,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void close() throws IOException {
         pis = new PipedInputStream();
         pos = new PipedOutputStream();
@@ -151,7 +151,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void connectLjava_io_PipedOutputStream() throws Exception {
         pis = new PipedInputStream();
         pos = new PipedOutputStream();
@@ -169,7 +169,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void test_read() throws Exception {
         pis = new PipedInputStream();
         pos = new PipedOutputStream();
@@ -187,7 +187,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void test_read$BII() throws Exception {
         pis = new PipedInputStream();
         pos = new PipedOutputStream();
@@ -209,7 +209,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void read$BII_2() throws IOException {
         PipedInputStream obj = new PipedInputStream();
         try {
@@ -223,7 +223,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void read$BII_3() throws IOException {
         PipedInputStream obj = new PipedInputStream();
         try {
@@ -237,7 +237,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void read$BII_4() throws IOException {
         PipedInputStream obj = new PipedInputStream();
         try {
@@ -379,7 +379,7 @@ public class PipedInputStreamTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void read_after_write_close() throws Exception {
         PipedInputStream in = new PipedInputStream();
         PipedOutputStream out = new PipedOutputStream();
diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java
index 659f325f2..bf658406d 100644
--- a/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java
@@ -90,14 +90,14 @@ public class PipedOutputStreamTest  {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void constructorLjava_io_PipedInputStream() throws Exception {
         out = new PipedOutputStream(new PipedInputStream());
         out.write('b');
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void close() throws Exception {
         out = new PipedOutputStream();
         reader = new PReader(out);
@@ -119,7 +119,7 @@ public class PipedOutputStreamTest  {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void connectLjava_io_PipedInputStream() {
         try {
             out = new PipedOutputStream();
@@ -134,7 +134,7 @@ public class PipedOutputStreamTest  {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void flush() throws IOException {
         out = new PipedOutputStream();
         reader = new PReader(out);
@@ -147,7 +147,7 @@ public class PipedOutputStreamTest  {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void write$BII() throws IOException {
         out = new PipedOutputStream();
         reader = new PReader(out);
@@ -159,7 +159,7 @@ public class PipedOutputStreamTest  {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void test_writeI() throws IOException {
         out = new PipedOutputStream();
         reader = new PReader(out);
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
index 42d4cb338..92a8d366d 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
@@ -76,7 +76,7 @@ public class ObjectTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void waitWorks() throws InterruptedException {
         long start = System.currentTimeMillis();
         final Object lock = new Object();
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
index a1e30fdbf..f97df71bc 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java
@@ -30,7 +30,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform(TestPlatform.WASI)
+@SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class ThreadTest {
     @Test
     public void sleeps() throws InterruptedException {
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java
index aa5778e03..ba18ada68 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java
@@ -30,7 +30,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class SerializedLambdaTest {
     @Test
     public void serializableLambdaHasWriteReplaceMethod() throws NoSuchMethodException, InvocationTargetException,
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java
index 9d24f2cef..e95073be4 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java
@@ -32,7 +32,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class ConstructorTest {
     @Test
     public void constructorsEnumerated() {
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java
index a99078cef..b256913cc 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java
@@ -29,7 +29,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class FieldTest {
     @Test
     public void fieldsEnumerated() {
diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java
index 567f3c0c3..456341cb6 100644
--- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java
@@ -31,7 +31,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+@SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class MethodTest {
     @Test
     public void methodsEnumerated() {
diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java
index 724d5a20c..4c01deb12 100644
--- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java
@@ -35,7 +35,7 @@ import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
 @EachTestCompiledSeparately
-@SkipPlatform(TestPlatform.WASI)
+@SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
 public class ArrayBlockingQueueTest {
     @Test
     public void constructed() {
diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicIntegerFieldUpdaterReflectionTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicIntegerFieldUpdaterReflectionTest.java
index fa01f55fa..d51c7edbd 100644
--- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicIntegerFieldUpdaterReflectionTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicIntegerFieldUpdaterReflectionTest.java
@@ -28,7 +28,7 @@ import org.teavm.junit.TeaVMTestRunner;
 import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
-@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI })
+@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC })
 public class AtomicIntegerFieldUpdaterReflectionTest {
     private Class<ClassWithField> getInstanceType() {
         return ClassWithField.class;
diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicLongFieldUpdaterReflectionTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicLongFieldUpdaterReflectionTest.java
index cc0260e7a..c584eb1b8 100644
--- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicLongFieldUpdaterReflectionTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicLongFieldUpdaterReflectionTest.java
@@ -28,7 +28,7 @@ import org.teavm.junit.TeaVMTestRunner;
 import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
-@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI })
+@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC })
 public class AtomicLongFieldUpdaterReflectionTest {
     private Class<ClassWithField> getInstanceType() {
         return ClassWithField.class;
diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicReferenceFieldUpdaterReflectionTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicReferenceFieldUpdaterReflectionTest.java
index afb4f4900..21d45fe70 100644
--- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicReferenceFieldUpdaterReflectionTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/AtomicReferenceFieldUpdaterReflectionTest.java
@@ -29,7 +29,7 @@ import org.teavm.junit.TeaVMTestRunner;
 import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
-@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI })
+@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC })
 public class AtomicReferenceFieldUpdaterReflectionTest {
     private Class<ClassWithField> getInstanceType() {
         return ClassWithField.class;
diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/MultiThreadedFieldUpdaterTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/MultiThreadedFieldUpdaterTest.java
index 301f288d0..50199ddff 100644
--- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/MultiThreadedFieldUpdaterTest.java
+++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/atomic/MultiThreadedFieldUpdaterTest.java
@@ -25,7 +25,7 @@ import org.teavm.junit.TeaVMTestRunner;
 import org.teavm.junit.TestPlatform;
 
 @RunWith(TeaVMTestRunner.class)
-@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI })
+@SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC })
 public class MultiThreadedFieldUpdaterTest {
     @Test
     public void getAndUpdate() {
diff --git a/tests/src/test/java/org/teavm/vm/VMTest.java b/tests/src/test/java/org/teavm/vm/VMTest.java
index c075b9829..309d1e7c7 100644
--- a/tests/src/test/java/org/teavm/vm/VMTest.java
+++ b/tests/src/test/java/org/teavm/vm/VMTest.java
@@ -258,7 +258,7 @@ public class VMTest {
 
     @Test
     @SkipJVM
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncClinit() {
         assertEquals(0, initCount);
         assertEquals("foo", AsyncClinitClass.foo());
@@ -270,13 +270,13 @@ public class VMTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncClinitField() {
         assertEquals("ok", AsyncClinitClass.state);
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncClinitInstance() {
         AsyncClinitClass acl = new AsyncClinitClass();
         assertEquals("ok", AsyncClinitClass.state);
@@ -284,7 +284,7 @@ public class VMTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncWait() {
         AsyncClinitClass acl = new AsyncClinitClass();
         acl.doWait();
@@ -293,7 +293,7 @@ public class VMTest {
 
     @Test
     @SkipJVM
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void loopAndExceptionPhi() {
         int[] a = createArray();
         int s = 0;
@@ -312,7 +312,7 @@ public class VMTest {
 
     @Test
     @SkipJVM
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncTryCatch() {
         try {
             throwExceptionAsync();
@@ -324,7 +324,7 @@ public class VMTest {
 
     @Test
     @SkipJVM
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void asyncExceptionHandler() {
         try {
             throw new RuntimeException("OK");
@@ -530,7 +530,7 @@ public class VMTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void indirectDefaultMethod() {
         StringBuilder sb = new StringBuilder();
         for (FirstPath o : new FirstPath[] { new PathJoint(), new FirstPathOptimizationPrevention() }) {
@@ -540,7 +540,7 @@ public class VMTest {
     }
 
     @Test
-    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI})
+    @SkipPlatform({TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void indirectDefaultMethodSubclass() {
         StringBuilder sb = new StringBuilder();
         for (FirstPath o : new FirstPath[] { new PathJointSubclass(), new FirstPathOptimizationPrevention() }) {
@@ -615,7 +615,7 @@ public class VMTest {
     }
 
     @Test
-    @SkipPlatform(TestPlatform.WASI)
+    @SkipPlatform({TestPlatform.WASI, TestPlatform.WEBASSEMBLY_GC})
     public void arrayMonitor() throws InterruptedException {
         int[] array = { 1, 2, 3 };
         synchronized (array) {