diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes
index d9e1485..6739a37 100644
--- a/apache-commons-collections.changes
+++ b/apache-commons-collections.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 19 08:49:50 UTC 2017 - tchvatal@suse.com
+
+- Fix build with new javapackages-tools
+
 -------------------------------------------------------------------
 Thu Dec 17 18:24:36 UTC 2015 - tchvatal@suse.com
 
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 66c0c76..a97c1f3 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-collections
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,7 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  apache-commons-parent
 BuildRequires:  java-devel
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
 Provides:       %{short_name} = %{version}-%{release}
@@ -103,12 +104,6 @@ cp -p %{SOURCE1} pom-testframework.xml
 sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
 
 %build
-#FIXME: the test fails on x390!
-#java: pthread_mutex_lock.c:71: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed.
-#ant -Djava.io.tmpdir=. test dist tf.javadoc
-#FIXME: the test fails on ppc with openjdk b11
-# See bnc#441085
-#ant -Djava.io.tmpdir=. dist tf.javadoc
 export CLASSPATH=$(build-classpath junit)
 ant \
     -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
@@ -148,7 +143,11 @@ cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframewo
 %{_javadir}/%{name}-testframework.jar
 %{_javadir}/%{short_name}-testframework.jar
 %{_mavenpomdir}/JPP-%{short_name}-testframework.pom
+%if %{?suse_version} > 1320
 %{_datadir}/maven-metadata/%{name}-testframework.xml
+%else
+%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)