diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 6ebc065..74bd3fb 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -17,7 +17,7 @@ Patch:          0002-Remove-authentication-plugin.patch
 Patch:          0003-Remove-StatementsTest.patch
 Patch:          0004-Port-to-Java-21.patch
 
-BuildRequires:  javapackages-local-openjdk21
+BuildRequires:  javapackages-local-openjdk25
 BuildRequires:  ant-junit5
 BuildRequires:  javassist
 BuildRequires:  protobuf-java
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index c9358ca..36643ec 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,10 +1,9 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
   ref: main
 execute:
   how: tmt
-environment:
-  JP_VALIDATOR_SOURCE_PATH: ''
-  JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory
+context:
+  jpv_flavor: generic