--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java	2019-03-12 08:10:23.291882337 +0100
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java	2019-03-12 08:10:22.931880008 +0100
@@ -44,6 +44,7 @@
 import org.graalvm.compiler.debug.GlobalMetrics;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.AssumptionViolatedException;
@@ -72,8 +73,8 @@
         }
     }
 
-    public static final boolean Java8OrEarlier = GraalServices.Java8OrEarlier;
-    public static final boolean Java11OrEarlier = GraalServices.Java11OrEarlier;
+    public static final boolean Java8OrEarlier = JavaVersionUtil.Java8OrEarlier;
+    public static final boolean Java11OrEarlier = JavaVersionUtil.Java11OrEarlier;
 
     protected Method getMethod(String methodName) {
         return getMethod(getClass(), methodName);