diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests1.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests1.java
index ad1778aa6a7..bb95a747d5a 100644
--- a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests1.java
+++ b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests1.java
@@ -306,7 +306,7 @@ public void test_printfFromDefaultLibWithMemAddr_LinkerOption_1() throws Throwab
 	public void test_validateTrivialOption_1() throws Throwable {
 		FunctionDescriptor fd = FunctionDescriptor.of(JAVA_INT, JAVA_INT);
 		MemorySegment functionSymbol = nativeLibLookup.find("validateTrivialOption").get();
-		MethodHandle mh = linker.downcallHandle(functionSymbol, fd, Linker.Option.critical());
+		MethodHandle mh = linker.downcallHandle(functionSymbol, fd, Linker.Option.critical(false));
 		int result = (int)mh.invokeExact(111);
 		Assert.assertEquals(result, 111);
 	}
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests2.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests2.java
index 55095366a8a..1b267288a9c 100644
--- a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests2.java
+++ b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/PrimitiveTypeTests2.java
@@ -306,7 +306,7 @@ public void test_printfFromDefaultLibWithMemAddr_LinkerOption_2() throws Throwab
 	public void test_validateTrivialOption_2() throws Throwable {
 		FunctionDescriptor fd = FunctionDescriptor.of(JAVA_INT, JAVA_INT);
 		MemorySegment functionSymbol = nativeLibLookup.find("validateTrivialOption").get();
-		MethodHandle mh = linker.downcallHandle(fd, Linker.Option.critical());
+		MethodHandle mh = linker.downcallHandle(fd, Linker.Option.critical(false));
 		int result = (int)mh.invokeExact(functionSymbol, 111);
 		Assert.assertEquals(result, 111);
 	}
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/InvalidUpCallTests.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/InvalidUpCallTests.java
index 4e918d80a4f..9b8f1f8c79e 100644
--- a/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/InvalidUpCallTests.java
+++ b/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/InvalidUpCallTests.java
@@ -296,7 +296,7 @@ public void test_InvalidLinkerOptions_isTrivial_1() throws Throwable {
 
 		try (Arena arena = Arena.ofConfined()) {
 			MemorySegment upcallFuncAddr = linker.upcallStub(UpcallMethodHandles.MH_add2IntStructs_returnStruct,
-					FunctionDescriptor.of(structLayout, structLayout, structLayout), arena, Linker.Option.critical());
+					FunctionDescriptor.of(structLayout, structLayout, structLayout), arena, Linker.Option.critical(false));
 			fail("Failed to throw out IllegalArgumentException in the case of the invalid linker option for upcall.");
 		}
 	}
@@ -305,7 +305,7 @@ public void test_InvalidLinkerOptions_isTrivial_1() throws Throwable {
 	public void test_InvalidLinkerOptions_isTrivial_2() throws Throwable {
 		FunctionDescriptor fd = FunctionDescriptor.of(JAVA_INT, JAVA_INT, ADDRESS);
 		MemorySegment functionSymbol = nativeLibLookup.find("captureTrivialOptionByUpcallMH").get();
-		MethodHandle mh = linker.downcallHandle(functionSymbol, fd, Linker.Option.critical());
+		MethodHandle mh = linker.downcallHandle(functionSymbol, fd, Linker.Option.critical(false));
 
 		try (Arena arena = Arena.ofConfined()) {
 			MemorySegment upcallFuncAddr = linker.upcallStub(UpcallMethodHandles.MH_captureTrivialOption,