diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index ae17c0c..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
 execute:
   how: tmt
diff --git a/testng.spec b/testng.spec
index 6173a52..cee1b41 100644
--- a/testng.spec
+++ b/testng.spec
@@ -22,7 +22,7 @@ Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.inject:guice)
@@ -30,8 +30,6 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 7.8.0-20
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -39,6 +37,12 @@ some new functionality, including flexible test configuration, and
 distributed test running.  It is designed to cover unit tests as well as
 functional, end-to-end, integration, etc.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -68,7 +72,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %build
 # Tests extend a class written in Kotlin
-%mvn_build -j -f -- -Dmaven.compiler.release=11
+%mvn_build -f -- -Dmaven.compiler.release=11
 
 %install
 %mvn_install
@@ -77,5 +81,8 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %doc CHANGES.txt README.md
 %license LICENSE.txt
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+
 %changelog
 %autochangelog