diff --git a/disable-ConnectTimeoutTest.patch b/disable-ConnectTimeoutTest.patch
new file mode 100644
index 0000000..cf9fd32
--- /dev/null
+++ b/disable-ConnectTimeoutTest.patch
@@ -0,0 +1,11 @@
+--- pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java.ORIG	2016-12-21 14:09:40.340533352 -0600
++++ pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java	2016-12-21 14:10:40.239090270 -0600
+@@ -112,7 +112,7 @@
+     suite.addTestSuite(LoginTimeoutTest.class);
+     suite.addTestSuite(TestACL.class);
+ 
+-    suite.addTestSuite(ConnectTimeoutTest.class);
++    // suite.addTestSuite(ConnectTimeoutTest.class);
+ 
+     suite.addTestSuite(PGPropertyTest.class);
+ 
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 6f63ef1..10a2136 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -47,7 +47,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	%upstreammajor.%{upstreamrel}
-Release:	5%{?dist}
+Release:	6%{?dist}
 # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
 License:	BSD and ASL 2.0
 URL:		http://jdbc.postgresql.org/
@@ -60,6 +60,10 @@ Source1:	postgres-testing.sh
 # having separate spec file for it, too.
 Source2:	https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver.tar.gz
 
+# disable test that makes unpredictable assumptions about non-routable IPs
+# See https://github.com/pgjdbc/pgjdbc/issues/556
+Patch0:         disable-ConnectTimeoutTest.patch
+
 BuildArch:	noarch
 BuildRequires:	java-devel >= 1.8
 BuildRequires:	maven-local
@@ -104,6 +108,8 @@ This package contains the API Documentation for %{name}.
 mv pgjdbc-REL%version/* .
 mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
 
+%patch0
+
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
 
@@ -185,6 +191,10 @@ opts="-f"
 
 
 %changelog
+* Thu Dec 22 2016 Pavel Raiskup <praiskup@redhat.com> - 9.4.1209-6
+- Disable unpredictable test to fix FTBFS (BZ#1406931),
+  patch by Merlin Mathesius
+
 * Thu Jul 21 2016 gil cattaneo <puntogil@libero.it> 9.4.1209-5
 - fix postgresql-jdbc.jar symlink using javapackages macros
 - adapt to current guideline