diff --git a/.gitignore b/.gitignore
index c8311bb..f6aa562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-SOURCES/istack-commons-2.21.tar.gz
+/istack-commons-2.6.1.tar.gz
+/istack-commons-2.17.tar.gz
 /istack-commons-2.21.tar.gz
diff --git a/istack-commons.spec b/istack-commons.spec
index ba72a06..8c71291 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,6 +1,6 @@
 Name:           istack-commons
 Version:        2.21
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Common code for some Glassfish projects
 License:        CDDL-1.1 and GPLv2 with exceptions
 URL:            http://istack-commons.java.net
@@ -15,11 +15,8 @@ BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.sun.codemodel:codemodel)
 BuildRequires:  mvn(com.sun:tools)
-BuildRequires:  mvn(dom4j:dom4j)
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.java:jvnet-parent:pom:)
 BuildRequires:  mvn(org.apache.ant:ant)
-BuildRequires:  mvn(org.apache.ant:ant-junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-aether-provider)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
@@ -43,7 +40,6 @@ BuildRequires:  mvn(org.eclipse.aether:aether-spi)
 BuildRequires:  mvn(org.eclipse.aether:aether-transport-file)
 BuildRequires:  mvn(org.eclipse.aether:aether-transport-wagon)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
-BuildRequires:  mvn(org.testng:testng)
 
 %description
 Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
@@ -76,13 +72,6 @@ Obsoletes:      %{name} < %{version}-%{release}
 %description runtime
 This package contains istack-commons runtime.
 
-%package test
-Summary:        istack-commons test
-Obsoletes:      %{name} < %{version}-%{release}
-
-%description test
-This package contains istack-commons test.
-
 %package tools
 Summary:        istack-commons tools
 Obsoletes:      %{name} < %{version}-%{release}
@@ -106,7 +95,6 @@ This package contains the API documentation for %{name}.
 # backward compatibility symlinks
 %mvn_file com.sun.istack:%{name}-buildtools %{name}-buildtools %{name}/%{name}-buildtools
 %mvn_file com.sun.istack:%{name}-runtime %{name}-runtime %{name}/%{name}-runtime
-%mvn_file com.sun.istack:%{name}-test %{name}-test %{name}/%{name}-test
 %mvn_file com.sun.istack:%{name}-tools %{name}-tools %{name}/%{name}-tools
 
 # Unused & unavailable dep
@@ -116,11 +104,12 @@ This package contains the API documentation for %{name}.
 %pom_remove_dep com.sun:tools tools
 %pom_add_dep com.sun:tools tools
 
+%pom_disable_module test
 %pom_disable_module soimp
 
 %build
 
-%mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -f -s -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
@@ -141,9 +130,6 @@ This package contains the API documentation for %{name}.
 %files runtime -f .mfiles-istack-commons-runtime
 %doc Licence.txt
 
-%files test -f .mfiles-istack-commons-test
-%doc Licence.txt
-
 %files tools -f .mfiles-istack-commons-tools
 %doc Licence.txt
 
@@ -152,6 +138,9 @@ This package contains the API documentation for %{name}.
 
 
 %changelog
+* Fri Jan 29 2021 Fraser Tweedale <ftweedal@redhat.com> - 2.21-10
+- Disable test module
+
 * Wed May 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.21-9
 - Disable soimp module