diff --git a/.gitignore b/.gitignore
index b170ba4..56fc631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /cassandane-b97ba9c.tar.gz
 /cassandane-0a6c13e.tar.gz
 /cassandane-2f8f3f4.tar.gz
+/cassandane-6d33978.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index f1d2d70..c8402cf 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,8 +1,8 @@
 %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}})
 
 # Cassandane doesn't have releases often, but it receives constant development.
-# This was fetched on 20170530.
-%global cmt1 2f8f3f4949e58bf20362c3cd8b1720f49002660d
+# This was fetched on 20170622
+%global cmt1 6d33978ebb0055be41a5cb8e52958e100401bf26
 
 # Cassandane run by default.  '--without cassandane' disables.
 %bcond_without cassandane
@@ -431,11 +431,10 @@ exit 0
 %ifarch s390x
 # Unfortunately s390x is simply too slow to reliably run the test suite right
 # now.  The suite brings up and tears down a complete cyrus environment for
-# each test, and the builders are simply unable to handle this reliably right
-# now.  Tests will simply fail randomly, and playing whack-a-mole with every
-# potential failure when a build takes seven hours is just too much.
-# s390x-specific test information is still present below in case situation
-# improves.
+# each test, and the builders are simply unable to handle this reliably.  Tests
+# will simply fail randomly, and playing whack-a-mole with every potential
+# failure when a build takes seven hours is just too much.  s390x-specific test
+# information is still present below in case situation improves.
 exit 0
 %endif
 
@@ -444,10 +443,10 @@ exit 0
 # Sadly Cassandane simply can't run on a 32-bit host at the moment.  It needs
 # Perl to be compiled with support for 64-bit types, and due to an unfortunate
 # typo in the Perl specfile, that's not the case currently.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1268828
-# There may be other Cassandane issues, so occasional testing on 32-bit
-# architectures is needed until this is all resolved.
-# Tracked upstream as https://github.com/cyrusimap/cassandane/issues/21
+# https://bugzilla.redhat.com/show_bug.cgi?id=1268828 There may be other
+# Cassandane issues, so occasional testing on 32-bit architectures is needed
+# until this is all resolved.  Tracked upstream as
+# https://github.com/cyrusimap/cassandane/issues/21
 pushd cassandane
 
 mkdir -p imaptest/src
@@ -468,61 +467,28 @@ export CYRUS_USER=$USER
 # and are more for testing system performance than for testing Cyrus itself.
 exclude=('!Cassandane::Test::Core' '!Metronome')
 
-# The below non-arch-specific excluded tests are expected to fail n 3.0.1 and
+# The below non-arch-specific excluded tests are expected to fail in 3.0.2 and
 # should be removed and re-checked at each release.
 tests=(
-    Admin.imap_admins Fetch.fetch_flags_before_exists  Quota.num_folders_rename
-    SearchFuzzy.cjk_words SearchFuzzy.xattachmentname
+    Admin.imap_admins
+    SearchFuzzy.cjk_words
+    JMAPCalendars.setcalendarevents_alerts
+    JMAPCalendars.setcalendarevents_locations
+    JMAPCalendars.setcalendarevents_recurrenceoverrides
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
-tests=(
-    creationids
-    getcalendareventlist
-    getcalendareventlist_date
-    getcalendareventlist_datetime
-    getcalendareventlist_text
-    getcalendarevents_privacy
-    getcalendarevents_properties
-    getcalendarevents_relatedto
-    getcalendarevents_simple
-    getcalendareventupdates
-    setcalendarevents_alerts
-    setcalendarevents_caldav
-    setcalendarevents_endtimezone
-    setcalendarevents_endtimezone_recurrence
-    setcalendarevents_isallday
-    setcalendarevents_links
-    setcalendarevents_localizations
-    setcalendarevents_locations
-    setcalendarevents_move
-    setcalendarevents_participantid
-    setcalendarevents_participants
-    setcalendarevents_prodid
-    setcalendarevents_recurrenceoverrides
-    setcalendarevents_relatedto
-    setcalendarevents_recurrence
-    setcalendarevents_schedule_cancel
-    setcalendarevents_schedule_reply
-    setcalendarevents_schedule_request
-    setcalendarevents_simple
-)
-for i in ${tests[@]}; do exclude+=("!JMAPCalendars.$i"); done
-tests=(
-    getmessagelist_attachments
-    getmessagelist_window
-    getmessages_attachment_name
-    getmessages_body_nontext
-    setmailboxes_destroy_empty
-    setmessages_attachments
-)
-for i in ${tests[@]}; do exclude+=("!JMAPMail.$i"); done
 
 %ifarch ppc64 s390x
-# Some failures only on little-endian machines for some reason
+# Some failures only on big-endian machines for some reason
+# Reported upstream at https://github.com/cyrusimap/cyrus-imapd/issues/2040
 tests=(
+    JMAPCalendars.getcalendareventlist
+    JMAPCalendars.getcalendareventupdates
+    JMAPCalendars.setcalendarevents_recurrence
     JMAPContacts.getcontactgroupupdates
     JMAPContacts.getcontactupdates
     JMAPMail.getmailboxupdates
+    JMAPMail.getmessagelist_window
     JMAPMail.getmessageupdates
     JMAPMail.getthreadupdates
 )
@@ -659,6 +625,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %changelog
 * Thu Jun 22 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-1
 - Update to 3.0.2.
+- New Cassandane snapshot, with more tests (all of which are passing).
 
 * 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
diff --git a/sources b/sources
index b73eb74..fd09790 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
 SHA512 (cassandane-2f8f3f4.tar.gz) = b949155b85e30a9cabd5992806fafe78a462662297398e8a74856f345c063769e5e419d01777e08c1f326622244181667ead47a057e38b1974ec121e7913a955
 SHA512 (cyrus-imapd-3.0.2.tar.gz) = 95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d
+SHA512 (cassandane-6d33978.tar.gz) = aafc2a98d49f86b00f5b1af649ce63157c8d0652502248271ca14e6f000aebf6eca8931a6e33cc068e37fdd086e9dc4cdc90cf7eccfdda63dfd73c733d75fc40