diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7909032..91f936a 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -43,6 +43,9 @@ Patch6: patch-cyrus-autoreconf-keep-version
 # Upstream https://github.com/cyrusimap/cyrus-imapd/issues/2026
 Patch7: patch-cyrus-managesieve-linking
 
+# Upstream https://github.com/cyrusimap/cassandane/issues/21
+Patch8: patch-cyrus-32bit-reconstruct
+
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
 Source12: cyrus-imapd.sysconfig
@@ -547,18 +550,6 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
 exclude+=("!Master.maxforkrate")
 %endif
 
-%ifarch i686 armv7hl
-# Some additional failures only on 32-bit machines.
-# Reported upstream as https://github.com/cyrusimap/cassandane/issues/21
-tests=(
-    Reconstruct.reconstruct_removedfile
-    Reconstruct.reconstruct_truncated
-    Reconstruct.reconstruct_zerouid
-    Quota.reconstruct
-    Quota.reconstruct_orphans
-)
-for i in ${tests[@]}; do exclude+=("!$i"); done
-
 %if 0%{?fedora} <= 26
 # For F26 and older, 32-bit Perl doesn't support the quad types in unpack.  The
 # following tests use those, and so they fail on those releases.
@@ -581,7 +572,6 @@ tests=(
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 %endif
-%endif
 
 # Add -vvv for too much output
 ./testrunner.pl %{?_smp_mflags} --cleanup -f pretty ${exclude[@]} 2>&1
@@ -683,6 +673,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 * Tue Jun 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-7
 - Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink
   there to the deliver binary.  This should help a bit with migrations.
+- Add upstream patch to fix reconstruct failures on 32-bit architectures.
+  Re-enable those five Cassandane tests.
 
 * Thu Jun 15 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-6
 - Rename two commands: quota -> cyr_quota, restore -> cyr_restore.