diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 6b60f63..1821a81 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.2.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Provides new interfaces, implementations and utilities for Java Collections
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}/
@@ -64,16 +64,11 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %mvn_file ':%{short_name}{,-testframework}' %{short_name}@1 %{name}@1
 
 %build
-# 2017-09-18 mizdebsk: Temporarly disable tests, they stopped working
-# after Maven Surefire upgrade to 2.20, need to investigate why.
-%mvn_build -f -- \
+%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 \
   -Dcommons.osgi.symbolicName=org.apache.commons.collections
 
-ant tf.javadoc -Dtf.build.docs=target/site/apidocs/
-
-%mvn_artifact %{short_name}:%{short_name}-testframework:%{version} target/%{short_name}-testframework-%{version}.jar
-
 %install
+%mvn_artifact %{short_name}:%{short_name}-testframework:%{version} target/%{short_name}-testframework-%{version}.jar
 %mvn_install
 
 %files -f .mfiles
@@ -87,6 +82,9 @@ ant tf.javadoc -Dtf.build.docs=target/site/apidocs/
 
 
 %changelog
+* Fri Nov 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-15
+- Adapt build and install scriptlets to fix issues in dependencies.
+
 * Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-14
 - Really actually skip tests to fix builds with xmvn 3.1.0.