diff --git a/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch b/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch
new file mode 100644
index 0000000..b083ec2
--- /dev/null
+++ b/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch
@@ -0,0 +1,50 @@
+From 2b60151aea6f03ac7e846aae0d21e7f335cad99c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
+Date: Wed, 9 Jan 2019 21:24:09 +0000
+Subject: [PATCH] Fix client_min_messages=FATAL test on upcoming PostgreSQL
+ releases
+
+The upcoming minor releases of PostgreSQL cap client_min_messages to
+ERROR to avoid the case this test was testing for.  Skip the test if
+client_min_messages doesn't come back as 'fatal' after we set it.
+---
+ t/02attribs.t | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/t/02attribs.t b/t/02attribs.t
+index b9ecd90..75e8f48 100644
+--- a/t/02attribs.t
++++ b/t/02attribs.t
+@@ -1204,15 +1204,20 @@ $sth->execute();
+ is ($warning, undef, $t);
+ 
+ ## Special case in which errors are not sent to the client!
+-$t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea};
+-$dbh->do(q{SET client_min_messages = 'FATAL'});
+-$dbh->{RaiseError} = 0;
+-$dbh->{AutoCommit} = 1;
+-eval {
+-    $dbh->do('SELECT 1 FROM nonesuh');
+-};
+-my $errorstring = $dbh->errstr;
+-like ( $errorstring, qr/Perhaps client_min_messages/, $t);
++SKIP: {
++    $t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea};
++    $dbh->do(q{SET client_min_messages = 'FATAL'});
++    skip "This version of PostgreSQL caps client_min_messages to ERROR", 1
++        unless $dbh->selectrow_array('SHOW client_min_messages') eq 'fatal';
++
++    $dbh->{RaiseError} = 0;
++    $dbh->{AutoCommit} = 1;
++    eval {
++        $dbh->do('SELECT 1 FROM nonesuh');
++    };
++    my $errorstring = $dbh->errstr;
++    like ( $errorstring, qr/Perhaps client_min_messages/, $t);
++}
+ $dbh->rollback();
+ $dbh->do(q{SET client_min_message = 'NOTICE'});
+ $dbh->{RaiseError} = 1;
+-- 
+2.20.1
+
diff --git a/perl-DBD-Pg.spec b/perl-DBD-Pg.spec
index 1341d91..f3a6766 100644
--- a/perl-DBD-Pg.spec
+++ b/perl-DBD-Pg.spec
@@ -1,12 +1,15 @@
 Name:           perl-DBD-Pg
 Summary:        A PostgreSQL interface for perl
 Version:        3.7.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 # Pg.pm, README:    Points to directory which contains GPLv2+ and Artistic
 # other files:      Same as Perl (GPL+ or Artistic)
 License:        GPLv2+ or Artistic
 Source0:        https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz 
 URL:            https://metacpan.org/release/DBD-Pg
+# Skip the test if client_min_messages doesn't come back as 'fatal' after
+# we set it (CPAN RT#128529)
+Patch0:         DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch
 
 BuildRequires:  findutils
 BuildRequires:  gcc
@@ -59,6 +62,7 @@ to PostgreSQL databases.
 
 %prep
 %setup -q -n DBD-Pg-%{version}
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" NO_PACKLIST=1
@@ -85,6 +89,9 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Mar 22 2019 Jitka Plesnikova <jplesnik@redhat.com> - 3.7.4-6
+- Fix failing test (bug #1679574)
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild