diff --git a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MinMaxCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MinMaxCanonicalizationTest.java
index 62b428f81fc7..05e8bddb62c7 100644
--- a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MinMaxCanonicalizationTest.java
+++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MinMaxCanonicalizationTest.java
@@ -27,7 +27,6 @@
 
 import org.junit.Test;
 
-import jdk.graal.compiler.core.common.NumUtil;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -102,7 +101,9 @@ public void testByteMaxEqualsToLessThanSymbolic() {
     }
 
     public static boolean byteUMaxEqualsToLessThanSnippet(ByteHolder holder) {
-        return NumUtil.maxUnsigned(holder.b & 0xff, 7) == 7;
+        byte b = holder.b;
+        int result = Integer.compareUnsigned(b & 0xff, 7) < 0 ? 7 : b & 0xff;
+        return result == 7;
     }
 
     public static boolean byteUMaxEqualsToLessThanReference(ByteHolder holder) {
@@ -128,7 +129,9 @@ public void testByteMinEqualsToLessThan() {
     }
 
     public static boolean byteUMinEqualsToLessThanSnippet(ByteHolder holder) {
-        return NumUtil.minUnsigned(holder.b & 0xff, 7) == 7;
+        byte b = holder.b;
+        int result = Integer.compareUnsigned(b & 0xff, 7) > 0 ? 7 : b & 0xff;
+        return result == 7;
     }
 
     public static boolean byteUMinEqualsToLessThanReference(ByteHolder holder) {