diff --git a/apache-commons-discovery-remove-unreliable-test.patch b/apache-commons-discovery-remove-unreliable-test.patch
new file mode 100644
index 0000000..3aa11d6
--- /dev/null
+++ b/apache-commons-discovery-remove-unreliable-test.patch
@@ -0,0 +1,41 @@
+From e61f06eccf6946a6dc4633fe39206d0ad427caab Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb@redhat.com>
+Date: Wed, 7 Aug 2013 07:12:16 +0200
+Subject: [PATCH] Remove unreliable test
+
+---
+ .../org/apache/commons/discovery/test/TestAll.java   | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/src/test/org/apache/commons/discovery/test/TestAll.java b/src/test/org/apache/commons/discovery/test/TestAll.java
+index 623a6d8..fa81585 100644
+--- a/src/test/org/apache/commons/discovery/test/TestAll.java
++++ b/src/test/org/apache/commons/discovery/test/TestAll.java
+@@ -291,24 +291,4 @@ public class TestAll {
+         assertNotNull(serviceImpl);
+         assertEquals(TestImpl2_1.class, serviceImpl.getClass());
+     }
+-
+-    @Test
+-    public void findImplementationsViaService() {
+-        final int expectedLogImplementations = 2;
+-        int actualLogImplementations = 0;
+-
+-        Enumeration<? extends Log> logImplementations = providers(newSPInterface(Log.class,
+-                new Class<?>[]{ String.class },
+-                new Object[]{ getClass().getName() }),
+-                null);
+-
+-        while (logImplementations.hasMoreElements()) {
+-            Log log = logImplementations.nextElement();
+-            assertNotNull(log);
+-            actualLogImplementations++;
+-        }
+-
+-        assertEquals(expectedLogImplementations, actualLogImplementations);
+-    }
+-
+ }
+-- 
+1.8.1.4
+
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index f3f03ed..1b347cb 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -3,19 +3,18 @@
 
 Name:           apache-%{short_name}
 Version:        0.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          2
 Summary:        Apache Commons Discovery
 License:        ASL 2.0
-Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Patch0:         %{name}-addosgimanifest.patch
+Patch1:         %{name}-remove-unreliable-test.patch
 BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  apache-commons-logging >= 1.1.1
 
@@ -31,9 +30,7 @@ instantiating classes, and for lifecycle management of singleton (factory)
 classes.
 
 %package javadoc
-Group:          Documentation
 Summary:        API documentation for %{name}
-Requires:       jpackage-utils
 
 Provides:       jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name}-javadoc <= 1:0.4
@@ -44,10 +41,11 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 1:0.4
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch0
+%patch1 -p1
 
 %build
 %mvn_file  : %{short_name} %{name}
-%mvn_build
+%mvn_build -X
 
 %install
 %mvn_install
@@ -60,6 +58,9 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 1:0.4
 
 
 %changelog
+* Wed Aug 07 2013 Michal Srb <msrb@redhat.com> - 2:0.5-9
+- Remove unreliable test (Resolves: #991968)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild