diff a/test/hotspot/jtreg/compiler/gcbarriers/TestShenandoahBarrierExpansion.java b/test/hotspot/jtreg/compiler/gcbarriers/TestShenandoahBarrierExpansion.java
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestShenandoahBarrierExpansion.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2024 Red Hat and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package compiler.gcbarriers;
-
-import compiler.lib.ir_framework.CompilePhase;
-import compiler.lib.ir_framework.DontInline;
-import compiler.lib.ir_framework.IR;
-import compiler.lib.ir_framework.IRNode;
-import compiler.lib.ir_framework.Test;
-import compiler.lib.ir_framework.TestFramework;
-
-/**
- * @test
- * @bug 8231569
- * @summary Test that Shenandoah barriers are expanded correctly
- * @library /test/lib /
- * @requires vm.gc.Shenandoah
- * @run main compiler.gcbarriers.TestShenandoahBarrierExpansion
- */
-public class TestShenandoahBarrierExpansion {
-    public static void main(String[] args) {
-        TestFramework test = new TestFramework(TestShenandoahBarrierExpansion.class);
-        test.addFlags("-XX:+UseShenandoahGC");
-        test.start();
-    }
-
-    private static Object staticField;
-    @Test
-    @IR(failOn = IRNode.IF, phase = CompilePhase.AFTER_PARSING)
-    @IR(counts = { IRNode.IF, "2" }, phase = CompilePhase.BARRIER_EXPANSION)
-    public Object testLoadFieldObject() {
-        return staticField;
-    }
-
-    private static A staticField2 = new A();
-    @Test
-    @IR(counts = { IRNode.IF, "1" }, phase = CompilePhase.AFTER_PARSING)
-    @IR(counts = { IRNode.IF, "3" }, phase = CompilePhase.BARRIER_EXPANSION)
-    private static int testLoadObjectFieldWithNullCheck() {
-        return staticField2.intField;
-    }
-
-    private static A staticField3 = new A();
-    @Test
-    @IR(counts = { IRNode.IF, "2" }, phase = CompilePhase.AFTER_PARSING)
-    @IR(counts = { IRNode.IF, "6" }, phase = CompilePhase.BARRIER_EXPANSION)
-    private static int testLoadTwoObjectFieldsWithNullCheck() {
-        return staticField2.intField + staticField3.intField;
-    }
-
-    @Test
-    @IR(failOn = IRNode.IF, phase = CompilePhase.AFTER_PARSING)
-    @IR(counts = { IRNode.IF, "4" }, phase = CompilePhase.BARRIER_EXPANSION)
-    private static void testLoadTwoFieldObjectAndEscape() {
-        final A field2 = staticField2;
-        final A field3 = staticField3;
-        notInlined(field2, field3);
-    }
-
-    @DontInline
-    private static void notInlined(A field2, A field3) {
-        // noop
-    }
-
-    private static class A {
-        public int intField;
-    }
-}