diff --git a/teckit-2.5.7-Remove-compressed-image-test.patch b/teckit-2.5.7-Remove-compressed-image-test.patch
new file mode 100644
index 0000000..2ee7111
--- /dev/null
+++ b/teckit-2.5.7-Remove-compressed-image-test.patch
@@ -0,0 +1,50 @@
+From 99f5259cf419c53c805c856ff59f28ce916e4743 Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Mon, 21 May 2018 16:00:59 -0500
+Subject: [PATCH] Remove compressed image test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The binary representation of a compressed block of data
+can vary depending on small implementation details in the
+compression library. Lets depend on the tests following
+the binary image comparison to decompress the .tec file
+and validate that the compress/decompress logic is functional.
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+Petr Písař: Ported to 2.5.7 from 99f5259cf419c53c805c856ff59f28ce916e4743.
+---
+ test/Makefile.am                 |   1 -
+ test/dotests.pl                  |   4 +++-
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 009b736..53d5198 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -7,7 +7,6 @@ check_DATA += mrk.sf.legacy.txt.orig
+ check_DATA += mrk.txt
+ check_DATA += NormalizationTest.txt
+ check_DATA += SILGreek2004-04-27.map
+-check_DATA += SILGreek2004-04-27.tec.orig
+ check_DATA += SILGreek2004-04-27.uncompressed.tec.orig
+ check_DATA += academy.tec
+ check_DATA += silipa93.tec
+diff --git a/test/dotests.pl b/test/dotests.pl
+index d8cc426..aa27401 100755
+--- a/test/dotests.pl
++++ b/test/dotests.pl
+@@ -41,7 +41,9 @@ compare("${srcdir}SILGreek2004-04-27.uncompressed.tec.orig", "SILGreek.uncompres
+ dotest("compiling Greek mapping (compressed)",
+ 	"${bindir}teckit_compile ${srcdir}SILGreek2004-04-27.map -o SILGreek.tec");
+ 
+-compare("${srcdir}SILGreek2004-04-27.tec.orig", "SILGreek.tec");
++# Don't bother to check the compressed file as changes to the compression library can
++# slightly change the resulting image. The tests below which use the compressed file
++# should be sufficient to verify that it can be decompressed/used properly
+ 
+ dotest("converting plain-text file to unicode",
+ 	"${bindir}txtconv -t SILGreek.tec -i ${srcdir}mrk.txt -o mrk.utf8.txt -nfc");
+-- 
+2.21.0
+
diff --git a/teckit.spec b/teckit.spec
index 4e26304..41c2d0d 100644
--- a/teckit.spec
+++ b/teckit.spec
@@ -1,6 +1,6 @@
 Name:           teckit
 Version:        2.5.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Conversion library and mapping compiler
 License:        LGPLv2+ or CPL
 URL:            http://scripts.sil.org/teckit
@@ -8,6 +8,9 @@ Source0:        https://github.com/silnrsi/teckit/releases/download/v%{version}/
 BuildRequires:  gcc-c++
 BuildRequires:  expat-devel zlib-devel libtool
 Patch0:         TECkit_2_5_1-includes.patch
+# Remove an unreliable test sensitive to nondeterministic image rendering,
+# bug #1606501, fixed in 2.5.8
+Patch1:         teckit-2.5.7-Remove-compressed-image-test.patch
 
 %description
 TECkit is a low-level toolkit intended to be used by other
@@ -36,6 +39,7 @@ tables from a human-readable mapping description (a simple text file).
 %prep
 %setup -q
 %patch0 -p1 -b .includes
+%patch1 -p1
 
 %{__rm} -r zlib*
 
@@ -73,6 +77,10 @@ make check
 %{_libdir}/pkgconfig/teckit.pc
 
 %changelog
+* Fri Aug 09 2019 Petr Pisar <ppisar@redhat.com> - 2.5.7-5
+- Remove an unreliable test sensitive to nondeterministic image rendering
+  (bug #1606501)
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild