diff --git a/junit.spec b/junit.spec
index 0bddd0e..ab5e8bb 100644
--- a/junit.spec
+++ b/junit.spec
@@ -20,7 +20,8 @@ Patch:          0002-Port-to-OpenJDK-21.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 %endif
 %if %{without bootstrap}
@@ -29,8 +30,6 @@ BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 # itself, so explicit BR on surefire-junit4 is needed.
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit4)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1:4.13.2-20
 
 %description
 JUnit is a regression testing framework written by Erich Gamma and Kent Beck. 
@@ -44,6 +43,12 @@ Summary:        Manual for %{name}
 %description manual
 Documentation for %{name}.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -55,7 +60,6 @@ sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
 sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
 
 %pom_remove_plugin :animal-sniffer-maven-plugin
-%pom_remove_plugin :maven-enforcer-plugin
 
 # Removing hamcrest source jar references (not available and/or necessary)
 %pom_remove_plugin :maven-javadoc-plugin
@@ -65,7 +69,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
 %mvn_alias junit:junit junit:junit-dep
 
 %build
-%mvn_build -j -- -DjdkVersion=1.8 -P\!restrict-doclint
+%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint
 
 %install
 %mvn_install
@@ -78,5 +82,8 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
 %license LICENSE-junit.txt
 %doc doc/*
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE-junit.txt
+
 %changelog
 %autochangelog
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