diff --git a/api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java b/api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
index 71ff142..e07c3fb 100644
--- a/api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
+++ b/api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -73,7 +73,7 @@ protected JAXBIntrospector() {}
      */
     public static Object getValue(Object jaxbElement) {
 	if (jaxbElement instanceof JAXBElement) {
-	    return ((JAXBElement)jaxbElement).getValue();
+	    return ((JAXBElement<?>)jaxbElement).getValue();
 	} else {
 	    // assume that class of this instance is
 	    // annotated with @XmlRootElement.
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index ab3cc65..1927357 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -30,9 +30,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -103,6 +103,7 @@
                             src/test/resources/logging.properties
                         </java.util.logging.config.file>
                     </systemPropertyVariables>
+                    <useModulePath>false</useModulePath>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextOldParameterized.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextOldParameterized.java
new file mode 100644
index 0000000..f3d8888
--- /dev/null
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextOldParameterized.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0, which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * Tests for jaxb API.
+ */
+package jakarta.xml.bind.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvFileSource;
+
+@ParameterizedTest
+@CsvFileSource(resources = "/jakarta/xml/bind/test/allScenarios.csv",
+    numLinesToSkip = 0,
+    nullValues = "**")
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JAXBContextOldParameterized {
+    
+}
diff --git a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
index 8a34537..6dd5674 100644
--- a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
@@ -10,15 +10,18 @@
 
 package jakarta.xml.bind.test;
 
-import org.junit.Before;
-import org.junit.Test;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContextFactory;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
-import jakarta.xml.bind.*;
 import java.util.Map;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.TestCase.fail;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 
 /**
  * regression test for
@@ -57,27 +60,27 @@ public Marshaller createMarshaller() throws JAXBException {
     public void testContextPath() {
         try {
             JAXBContext ctx = JAXBContext.newInstance("whatever", ClassLoader.getSystemClassLoader());
-            assertNotNull("Expected non-null instance to be returned from the test Factory", ctx);
-            assertEquals("Expected MyContext instance to be returned from the test Factory", MyContext.class, ctx.getClass());
+            Assertions.assertNotNull(ctx,"Expected non-null instance to be returned from the test Factory");
+            Assertions.assertEquals(MyContext.class, ctx.getClass(), "Expected MyContext instance to be returned from the test Factory");
         } catch (Throwable t) {
             t.printStackTrace();
-            fail("Not expected to fail!");
+            Assertions.fail("Not expected to fail!");
         }
     }
 
     @Test
     public void testClasses() {
         try {
-            JAXBContext ctx = JAXBContext.newInstance(new Class[0]);
-            assertNotNull("Expected non-null instance to be returned from the test Factory", ctx);
-            assertEquals("Expected MyContext instance to be returned from the test Factory", MyContext.class, ctx.getClass());
+            JAXBContext ctx = JAXBContext.newInstance(new Class<?>[0]);
+            Assertions.assertNotNull(ctx, "Expected non-null instance to be returned from the test Factory");
+            Assertions.assertEquals(MyContext.class, ctx.getClass(), "Expected MyContext instance to be returned from the test Factory");
         } catch (Throwable t) {
             t.printStackTrace();
-            fail("Not expected to fail!");
+            Assertions.fail("Not expected to fail!");
         }
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         System.setProperty("jakarta.xml.bind.JAXBContextFactory", "jakarta.xml.bind.test.JAXBContextServiceProviderNPETest$Factory");
     }
diff --git a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
index 0287bb9..47bae9a 100644
--- a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -10,15 +10,12 @@
 
 package jakarta.xml.bind.test;
 
-
 import jaxb.test.usr.A;
-import junit.framework.AssertionFailedError;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import jakarta.xml.bind.JAXBContext;
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -26,8 +23,16 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
 
-import static junit.framework.TestCase.assertTrue;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opentest4j.AssertionFailedError;
 
 /*
  * test for JDK-8131334: SAAJ Plugability Layer: using java.util.ServiceLoader
@@ -37,7 +42,6 @@
  *   1. allow java to write into $JAVA_HOME/conf: mkdir $JAVA_HOME/conf; chmod a+rw $JAVA_HOME/conf
  *   2. use "runUnsafe" property: mvn clean test -DrunUnsafe=true
  */
-@RunWith(Parameterized.class)
 public class JAXBContextTest {
 
     static final Logger logger = Logger.getLogger(JAXBContextTest.class.getName());
@@ -48,12 +52,6 @@ public class JAXBContextTest {
 
     // test-classes directory (required for setup and for security settings)
     static final String classesDir = JAXBContextTest.class.getProtectionDomain().getCodeSource().getLocation().getFile();
-    private static final String FACTORY_ID_LEGACY = "jakarta.xml.bind.context.factory";
-    private static final String FACTORY_ID = "jakarta.xml.bind.JAXBContextFactory";
-    private static final String PACKAGE_LEGACY = "jaxb.factory.legacy."; // TODO: ???
-    private static final String PACKAGE_SPI = "jaxb.factory.spi."; // TODO: ???
-    private static final Object DEFAULT = "com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl";
-
 
     static {
         System.setProperty("classesDir", classesDir);
@@ -77,78 +75,12 @@ public class JAXBContextTest {
     private String expectedFactory;
     private Class<?> expectedException;
 
-    // Broken configurations were commented out.
-    @Parameterized.Parameters
-    public static Collection configurations() {
-        return Arrays.asList(new Object[][]{
-                // scenario-name, jaxb.properties, svc, arg1, arg2, system-props
-//                {"scenario-1", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Valid", null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
-                {"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
-                {"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-13", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid3"},
-
-//                {"scenario-1", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Valid", null, PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-                {"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
-                {"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-13", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid3"},
-
-//                {"scenario-1", FACTORY_ID + "="+PACKAGE_SPI+"Valid", null, PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-                {"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
-                {"scenario-4", FACTORY_ID + "="+PACKAGE_SPI+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-13", FACTORY_ID + "="+PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid3"},
-
-//                {"scenario-1", FACTORY_ID + "="+PACKAGE_LEGACY+"Valid", null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
-                {"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
-                {"scenario-4", FACTORY_ID + "="+PACKAGE_LEGACY+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-13", FACTORY_ID + "="+PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid3"},
-
-
-                {"scenario-2", "something=AnotherThing", null, null, jakarta.xml.bind.JAXBException.class, null},
-
-                // service loader
-                {"scenario-8", null, PACKAGE_SPI+"Valid\n", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-                {"scenario-9", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-                {"scenario-11", null, PACKAGE_SPI+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
-                {"scenario-15", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-
-                // service loader - legacy
-//                {"scenario-8 legacy-svc", null, PACKAGE_SPI+"Valid\n", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-//                {"scenario-9 legacy-svc", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-                {"scenario-11 legacy-svc", null, PACKAGE_SPI+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-15 legacy-svc", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
-
-                // service loader - legacy
-//                {"scenario-8 legacy-svc", null, PACKAGE_LEGACY+"Valid\n", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
-//                {"scenario-9 legacy-svc", null, PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
-                {"scenario-11 legacy-svc", null, PACKAGE_LEGACY+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
-//                {"scenario-15 legacy-svc", null, PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
-
-                // system property
-                {"scenario-5", null, null, PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid"},
-                {"scenario-7", null, null, null, jakarta.xml.bind.JAXBException.class, PACKAGE_SPI+"Invalid"},
-                {"scenario-14", null, PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid"},
-
-                {"scenario-5", null, null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid"},
-                {"scenario-7", null, null, null, jakarta.xml.bind.JAXBException.class, PACKAGE_LEGACY+"Invalid"},
-                {"scenario-14", null, PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid"},
-                {"scenario-6", null, null, null, jakarta.xml.bind.JAXBException.class, "jaxb.factory.NonExisting"},
-
-                {"scenario-10", null, "jaxb.factory.NonExisting", null, jakarta.xml.bind.JAXBException.class, null},
-
-                {"scenario-12", null, null, DEFAULT, jakarta.xml.bind.JAXBException.class, null},
-        });
-    }
-
-    // scenario-name, jaxb.properties, svc, arg1, arg2, system-props
-    public JAXBContextTest(
-            String scenario,
-            String jaxbPropertiesClass,
-            String spiClass,
-            String expectedFactory,
-            Class<?> expectedException,
-            String systemProperty
-    ) {
-
+    void setup(String scenario,
+        String jaxbPropertiesClass,
+        String spiClass,
+        String expectedFactory,
+        Class<?> expectedException,
+        String systemProperty) {
         // ensure setup may be done ...
         System.setSecurityManager(null);
 
@@ -170,8 +102,19 @@ public JAXBContextTest(
         prepare(jaxbPropertiesClass, spiClass);
     }
 
-    @Test
-    public void testPath() throws IOException {
+    @JAXBContextOldParameterized
+    void testPath(String scenario,
+            String jaxbPropertiesClass,
+            String spiClass,
+            String expectedFactory,
+            Class<?> expectedException,
+            String systemProperty) throws IOException {
+        setup(scenario,
+            jaxbPropertiesClass,
+            spiClass,
+            expectedFactory,
+            expectedException,
+            systemProperty);
         logConfigurations();
         try {
             JAXBContext ctx = JAXBContext.newInstance("jaxb.test.usr");
@@ -183,8 +126,19 @@ public void testPath() throws IOException {
         }
     }
 
-    @Test
-    public void testClasses() throws IOException {
+    @JAXBContextOldParameterized
+    public void testClasses(String scenario,
+            String jaxbPropertiesClass,
+            String spiClass,
+            String expectedFactory,
+            Class<?> expectedException,
+            String systemProperty) throws IOException {
+        setup(scenario,
+            jaxbPropertiesClass,
+            spiClass,
+            expectedFactory,
+            expectedException,
+            systemProperty);
         logConfigurations();
         try {
             JAXBContext ctx = JAXBContext.newInstance(new Class[] {A.class}, null);
@@ -196,8 +150,19 @@ public void testClasses() throws IOException {
         }
     }
 
-    @Test
-    public void testClass() throws IOException {
+    @JAXBContextOldParameterized
+    public void testClass(String scenario,
+            String jaxbPropertiesClass,
+            String spiClass,
+            String expectedFactory,
+            Class<?> expectedException,
+            String systemProperty) throws IOException {
+        setup(scenario,
+            jaxbPropertiesClass,
+            spiClass,
+            expectedFactory,
+            expectedException,
+            systemProperty);
         logConfigurations();
         try {
             JAXBContext ctx = JAXBContext.newInstance(A.class);
@@ -210,11 +175,11 @@ public void testClass() throws IOException {
     }
 
     private void handleResult(JAXBContext ctx) {
-        assertTrue("No ctx found.", ctx != null);
+        Assertions.assertTrue(null != ctx, "No ctx found.");
         log("     TEST: context class = [" + ctx.getClass().getName() + "]\n");
         String className = ctx.getClass().getName();
-        assertTrue("Incorrect ctx: [" + className + "], Expected: [" + expectedFactory + "]",
-                className.equals(expectedFactory));
+        Assertions.assertTrue(className.equals(expectedFactory),
+            "Incorrect ctx: [" + className + "], Expected: [" + expectedFactory + "]");
 
         log(" TEST PASSED");
     }
@@ -229,8 +194,8 @@ private void handleThrowable(Throwable throwable) {
         if (expectedException == null) {
             throw new AssertionFailedError("Unexpected exception:" + throwableClass);
         }
-        assertTrue("Got unexpected exception: [" + throwableClass + "], expected: [" + expectedException + "]",
-                correctException);
+        Assertions.assertTrue(correctException,
+            "Got unexpected exception: [" + throwableClass + "], expected: [" + expectedException + "]");
         log(" TEST PASSED");
     }
 
@@ -243,25 +208,54 @@ private void doFinally() {
         System.setSecurityManager(null);
     }
 
-    @Test
-    public void testPathSM() throws IOException {
+    @JAXBContextOldParameterized
+    public void testPathSM(String scenario,
+        String jaxbPropertiesClass,
+        String spiClass,
+        String expectedFactory,
+        Class<?> expectedException,
+        String systemProperty) throws IOException {
         enableSM();
-        testPath();
+        testPath(scenario,
+        jaxbPropertiesClass,
+        spiClass,
+        expectedFactory,
+        expectedException,
+        systemProperty);
     }
 
-    @Test
-    public void testClassSM() throws IOException {
+    @JAXBContextOldParameterized
+    public void testClassSM(String scenario,
+            String jaxbPropertiesClass,
+            String spiClass,
+            String expectedFactory,
+            Class<?> expectedException,
+            String systemProperty) throws IOException {
         enableSM();
-        testClass();
+        testClass(scenario,
+        jaxbPropertiesClass,
+        spiClass,
+        expectedFactory,
+        expectedException,
+        systemProperty);
     }
 
-    @Test
-    public void testClassesSM() throws IOException {
+    @JAXBContextOldParameterized
+    public void testClassesSM(String scenario,
+            String jaxbPropertiesClass,
+            String spiClass,
+            String expectedFactory,
+            Class<?> expectedException,
+            String systemProperty) throws IOException {
         enableSM();
-        testClasses();
+        testClasses(scenario,
+        jaxbPropertiesClass,
+        spiClass,
+        expectedFactory,
+        expectedException,
+        systemProperty);
     }
 
-
     private void enableSM() {
         System.setSecurityManager(null);
         System.setProperty("java.security.policy", classesDir + "jakarta/xml/bind/test.policy");
diff --git a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
index f312f1a..ff2131d 100644
--- a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -10,16 +10,13 @@
 
 package jakarta.xml.bind.test;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import java.util.Map;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertNull;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * regression test for
@@ -30,7 +27,7 @@ public class JAXBContextWrapExceptionTest {
 
     public static class Factory {
 
-        public static JAXBContext createContext(Class[] classesToBeBound, Map<String, ?> properties) throws JAXBException {
+        public static JAXBContext createContext(Class<?>[] classesToBeBound, Map<String, ?> properties) throws JAXBException {
             throw new JAXBException("test");
         }
 
@@ -45,23 +42,23 @@ public void testContextPath() {
         try {
             JAXBContext.newInstance("whatever", ClassLoader.getSystemClassLoader());
         } catch (Throwable t) {
-            assertEquals("test", t.getMessage());
-            assertNull("Root cause must be null", t.getCause());
+            Assertions.assertEquals(t.getMessage(), "test");
+            Assertions.assertNull(t.getCause(), "Root cause must be null");
         }
     }
 
     @Test
     public void testClasses() {
         try {
-            JAXBContext.newInstance(new Class[0]);
-            assertTrue("This should fail", false);
+            JAXBContext.newInstance(new Class<?>[0]);
+            Assertions.assertTrue(false, "This should fail");
         } catch (Throwable t) {
-            assertEquals("test", t.getMessage());
-            assertNull("Root cause must be null", t.getCause());
+            Assertions.assertEquals(t.getMessage(), "test");
+            Assertions.assertNull(t.getCause(), "Root cause must be null");
         }
     }
 
-    @Before
+    @BeforeEach
     public void setup() {
         System.setProperty("jakarta.xml.bind.JAXBContextFactory", "jakarta.xml.bind.test.JAXBContextWrapExceptionTest$Factory");
     }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
index 0c34eba..8470bdd 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -26,7 +26,7 @@ public static JAXBContext createContext(java.lang.String path, java.lang.ClassLo
         return new JAXBContext1();
     }
 
-    public static JAXBContext createContext(Class[] classes, Map<String, Object> properties) throws JAXBException {
+    public static JAXBContext createContext(Class<?>[] classes, Map<String, Object> properties) throws JAXBException {
         return new JAXBContext1();
     }
 
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
index ce29d8b..980a066 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -27,7 +27,7 @@ public static JAXBContext createContext(String path, ClassLoader cl) {
         return new JAXBContext1();
     }
 
-    public static JAXBContext createContext(Class[] classes, Map<String, Object> properties) throws JAXBException {
+    public static JAXBContext createContext(Class<?>[] classes, Map<String, Object> properties) throws JAXBException {
         return new JAXBContext1();
     }
 
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
index e214765..83c86b5 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -27,7 +27,7 @@ public static JAXBContext createContext(String path, ClassLoader cl) {
         return new JAXBContext1();
     }
 
-    public static JAXBContext createContext(Class[] classes, Map<String, Object> properties) throws JAXBException {
+    public static JAXBContext createContext(Class<?>[] classes, Map<String, Object> properties) throws JAXBException {
         return new JAXBContext1();
     }
 
diff --git a/jaxb-api-test/src/test/java/module-info.java b/jaxb-api-test/src/test/java/module-info.java
index f9de673..a404ead 100644
--- a/jaxb-api-test/src/test/java/module-info.java
+++ b/jaxb-api-test/src/test/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,5 +14,6 @@
 module jakarta.xml.bind.tests {
     requires jakarta.xml.bind;
     requires java.logging;
-    requires junit;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
 }
diff --git a/jaxb-api-test/src/test/resources/jakarta/xml/bind/test/allScenarios.csv b/jaxb-api-test/src/test/resources/jakarta/xml/bind/test/allScenarios.csv
new file mode 100644
index 0000000..3b07d5f
--- /dev/null
+++ b/jaxb-api-test/src/test/resources/jakarta/xml/bind/test/allScenarios.csv
@@ -0,0 +1,24 @@
+scenario-3, jakarta.xml.bind.context.factory=non.existing.FactoryClass, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-4, jakarta.xml.bind.context.factory=jaxb.factory.legacy.Invalid, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-3, jakarta.xml.bind.context.factory=non.existing.FactoryClass, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-4, jakarta.xml.bind.context.factory=jaxb.factory.spi.Invalid, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-3, jakarta.xml.bind.JAXBContextFactory=non.existing.FactoryClass, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-4, jakarta.xml.bind.JAXBContextFactory=jaxb.factory.spi.Invalid, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-3, jakarta.xml.bind.JAXBContextFactory=non.existing.FactoryClass, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-4, jakarta.xml.bind.JAXBContextFactory=jaxb.factory.legacy.Invalid, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-2, something=AnotherThing, null, null, "jakarta.xml.bind.JAXBException", null
+scenario-8, null, jaxb.factory.spi.Valid\n, jaxb.factory.spi.Valid$JAXBContext1, "jakarta.xml.bind.JAXBException", null
+scenario-9, null, jaxb.factory.spi.Valid, jaxb.factory.spi.Valid$JAXBContext1, "jakarta.xml.bind.JAXBException", null
+scenario-11, null, jaxb.factory.spi.Invalid, null, "jakarta.xml.bind.JAXBException", null
+scenario-15, null, jaxb.factory.spi.Valid, jaxb.factory.spi.Valid$JAXBContext1, "jakarta.xml.bind.JAXBException", null
+scenario-11 legacy-svc, null, jaxb.factory.spi.Invalid, null, "jakarta.xml.bind.JAXBException", null
+scenario-11 legacy-svc, null, jaxb.factory.legacy.Invalid, null, "jakarta.xml.bind.JAXBException", null
+scenario-5, null, null, jaxb.factory.spi.Valid$JAXBContext1, "**", jaxb.factory.spi.Valid
+scenario-7, null, null, null, "jakarta.xml.bind.JAXBException", jaxb.factory.spi.Invalid
+scenario-14, null, jaxb.factory.spi.Valid2, jaxb.factory.spi.Valid$JAXBContext1, "**", jaxb.factory.spi.Valid
+scenario-5, null, null, jaxb.factory.legacy.Valid$JAXBContext1, "**", jaxb.factory.legacy.Valid
+scenario-7, null, null, null, "jakarta.xml.bind.JAXBException", jaxb.factory.legacy.Invalid
+scenario-14, null, jaxb.factory.legacy.Valid2, jaxb.factory.legacy.Valid$JAXBContext1, "**", jaxb.factory.legacy.Valid
+scenario-6, null, null, null, "jakarta.xml.bind.JAXBException", jaxb.factory.NonExisting
+scenario-10, null, jaxb.factory.NonExisting, null, "jakarta.xml.bind.JAXBException", null
+scenario-12, null, null, DEFAULT, "jakarta.xml.bind.JAXBException", null
\ No newline at end of file