diff --git a/maven-surefire.spec b/maven-surefire.spec
index 1c3ac38..933e5a5 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -18,21 +18,14 @@ Patch2:         0002-Port-to-current-maven-shared-utils.patch
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@@ -41,7 +34,6 @@ BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-toolchain)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
@@ -62,12 +54,6 @@ Summary:                Surefire plugin for maven
 %description plugin
 Maven surefire plugin for running tests via the surefire framework.
 
-%package report-plugin
-Summary:                Surefire reports plugin for maven
-
-%description report-plugin
-Plugin for generating reports from surefire test runs.
-
 %package provider-junit
 Summary:                JUnit provider for Maven Surefire
 
@@ -86,12 +72,6 @@ Summary:                TestNG provider for Maven Surefire
 %description provider-testng
 TestNG provider for Maven Surefire.
 
-%package report-parser
-Summary:                Parses report output files from surefire
-
-%description report-parser
-Plugin for parsing report output files from surefire.
-
 %package -n maven-failsafe-plugin
 Summary:                Maven plugin for running integration tests
 
@@ -128,6 +108,8 @@ cp -p %{SOURCE2} .
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
 
+%pom_disable_module maven-surefire-report-plugin
+%pom_disable_module surefire-report-parser
 %pom_disable_module surefire-shadefire
 
 %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
@@ -150,9 +132,9 @@ sed -i /-Xdoclint:all/d pom.xml
 
 
 %build
-%mvn_package ":*{surefire-plugin,report-plugin}*" @1
+%mvn_package ":*{surefire-plugin}*" @1
 %mvn_package ":*junit-platform*" junit5
-%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
+%mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
 %mvn_package ":*tests*" __noinstall
 # tests turned off because they need jmock
 %mvn_build -f
@@ -166,8 +148,6 @@ sed -i /-Xdoclint:all/d pom.xml
 %license LICENSE NOTICE cpl-v10.html
 
 %files plugin -f .mfiles-surefire-plugin
-%files report-plugin -f .mfiles-report-plugin
-%files report-parser -f .mfiles-report-parser
 %files provider-junit -f .mfiles-junit
 %files provider-junit5 -f .mfiles-junit5
 %files provider-testng -f .mfiles-testng