diff --git a/.gitignore b/.gitignore
index c365257..dd6269d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /cyrus-imapd-*/
 /cassandane-testdata-20170523.tar.gz
 /cassandane-b97ba9c.tar.gz
+/cassandane-0a6c13e.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 5f1ceda..1503055 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -25,6 +25,8 @@ License: BSD
 URL: http://www.cyrusimap.org/
 Source0: http://www.cyrusimap.org/releases/%name-%version.tar.gz
 
+Patch0: patch-cyrus-testsuite-endianness
+
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
 Source12: cyrus-imapd.sysconfig
diff --git a/patch-cyrus-testsuite-endianness b/patch-cyrus-testsuite-endianness
new file mode 100644
index 0000000..2f54012
--- /dev/null
+++ b/patch-cyrus-testsuite-endianness
@@ -0,0 +1,22 @@
+diff --git a/cunit/timeout.c b/cunit/timeout.c
+index f02c9ac..a444ac8 100644
+--- a/cunit/timeout.c
++++ b/cunit/timeout.c
+@@ -197,7 +197,7 @@ int timeout_init(void (*cb)(void))
+ 
+ int timeout_begin(int millisec)
+ {
+-    int c;
++    char c;
+     int r;
+ 
+ // fprintf(stderr, "timeout_begin\n");
+@@ -220,7 +220,7 @@ int timeout_begin(int millisec)
+ 
+ int timeout_end(void)
+ {
+-    int c;
++    char c;
+     int r;
+ 
+ // fprintf(stderr, "timeout_end\n");