diff --git a/GD-2.56-flaky-test.patch b/GD-2.56-flaky-test.patch
new file mode 100644
index 0000000..2b929f6
--- /dev/null
+++ b/GD-2.56-flaky-test.patch
@@ -0,0 +1,13 @@
+--- t/GD.t
++++ t/GD.t
+@@ -246,7 +246,10 @@ sub run_image_regression_tests {
+ 	if (!$gd) {
+ 	    fail("unable to generate comparison image for test $t: $@");
+ 	} else {
++	  TODO: {
++	    local $TODO = "Flaky test (CPAN RT#100294)" if $t == 7;
+ 	    ok(compare($gd,$t,$suffix),"image comparison test $t");
++	  }
+ 	}
+     }
+ }
diff --git a/perl-GD.spec b/perl-GD.spec
index 857ac5b..7c81ec4 100644
--- a/perl-GD.spec
+++ b/perl-GD.spec
@@ -1,14 +1,19 @@
 Name:           perl-GD
 Version:        2.56
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to the GD graphics library
 Group:          Development/Libraries
 License:        GPL+ or Artistic 2.0
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
 Patch0:         GD-2.56-utf8.patch
+Patch1:         GD-2.56-flaky-test.patch
 # Module Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  gcc
 BuildRequires:  gd-devel >= 2.0.28
+BuildRequires:  make
 BuildRequires:  perl
 BuildRequires:  perl(Config)
 BuildRequires:  perl(Getopt::Long)
@@ -47,6 +52,9 @@ create PNG images on the fly or modify existing files.
 # Re-code documentation as UTF8
 %patch0
 
+# Mark the flaky image comparison test as TODO (#1291200, CPAN RT#100294)
+%patch1
+
 # Fix shellbangs in sample scripts
 perl -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
       demos/{*.{pl,cgi},truetype_test}
@@ -69,13 +77,12 @@ rm %{buildroot}%{_bindir}/bdf2gdfont.PLS \
 rm %{buildroot}%{_bindir}/bdftogd
 
 %check
-./Build test
+./Build test --verbose
 
 %files
 %license LICENSE
 %doc ChangeLog README README.QUICKDRAW demos/
 %{_bindir}/bdf2gdfont.pl
-# %%{_bindir}/bdftogd
 %{_bindir}/cvtbdf.pl
 %{perl_vendorarch}/auto/GD/
 %{perl_vendorarch}/GD.pm
@@ -88,6 +95,9 @@ rm %{buildroot}%{_bindir}/bdftogd
 %{_mandir}/man3/GD::Simple.3*
 
 %changelog
+* Mon Dec 14 2015 Paul Howarth <paul@city-fan.org> - 2.56-6
+- Mark the flaky image comparison test as TODO (#1291200, CPAN RT#100294)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.56-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild