diff --git a/.gitignore b/.gitignore
index 4b3cdf2..801e826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /cassandane-50a1ec2.tar.gz
 /cassandane-389601b.tar.gz
 /cassandane-e4e97bb.tar.gz
+/cassandane-00bfe01.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7bfe754..4087d58 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,16 +1,14 @@
 %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}})
 
 # Cassandane commit hash.  Cassandane doesn't have releases often, but it
-# receives constant development.  This was fetched on 20180416.
-# Note that this cannot be updated to a newer version without Mail::JMAPTalk
-# 0.11 which as of 20180417 has not yet been released.
-%global cocas e4e97bb3613a33d4c229d2843288515ad6d78305
+# receives constant development.  This was fetched on 20180518.
+%global cocas 00bfe0109f80437ed09154aca9fbd53eef8f1b09
 
 # Cassandane run by default.  '--without cassandane' disables.
 %bcond_without cassandane
 
 Name: cyrus-imapd
-Version: 3.0.6
+Version: 3.0.7
 Release: 1%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
@@ -451,6 +449,15 @@ tests=(
     # OK, but it is not yet released.  The alternative is to bundle.
     SearchFuzzy.cjk_words
 
+    # These additionaly fail because Cyrus 3.0.7 no longer enables
+    # SNIPPET_EMPTY_WITHOUT_MATCH when the Cyrus-patched Xapian is not in use.
+    # https://github.com/cyrusimap/cyrus-imapd/commit/f008060cb53b3286fcedf7b8b4dd12c1980d665f
+    SearchFuzzy.normalize_snippets
+    SearchFuzzy.snippet_wildcard
+    SearchFuzzy.snippets_termcover
+    SearchFuzzy.snippets_escapehtml
+    SearchFuzzy.stem_verbs
+
     # As of yet unexplained
     # https://github.com/cyrusimap/cyrus-imapd/issues/2047
     Admin.imap_admins
@@ -462,16 +469,6 @@ tests=(
     # This one needs a patch to xapian.
     # https://github.com/cyrusimap/cyrus-imapd/issues/2348
     SearchFuzzy.search_subjectsnippet
-
-    # These are newly (20180411) added tests which don't seem to work against
-    # the 3.0.5 codebase.  https://github.com/cyrusimap/cassandane/issues/54
-    Sieve.rfc5490_mailboxexists_variables # This one is actually a Cyrus bug
-
-    # This fails beginning with 3.0.6 due to a bug in Net::CalDAVTalk.  The
-    # issue is related to the removal of JMAP support; CalDAVTalk checks for a
-    # jmap-specific thing which is no longer present.
-    # https://github.com/cyrusimap/cyrus-imapd/issues/2332
-    Caldav.supports_event
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
@@ -622,6 +619,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-1
+- Update to 3.0.7.
+- Update Cassandane checkout.
+- Update excluded Cassandane test list.
+
 * Tue May 01 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.6-1
 - Update to 3.0.6.
 - Remove upstreamed patches and renumber the rest.
diff --git a/sources b/sources
index d324030..8df2b50 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
-SHA512 (cassandane-e4e97bb.tar.gz) = d8ecedc9255caa327d4631f83b7f48fc13ab9a48803b0a793a44e294f128dc302e92da2d7623e83914591d86231492eedb5359954cbe84eee37d2f7ab4878677
-SHA512 (cyrus-imapd-3.0.6.tar.gz) = 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
+SHA512 (cyrus-imapd-3.0.7.tar.gz) = 6f9af658df6ae6e4463bb52c672c7e8d49482c8e5542985825f099ea8b76291d1598a2a5c92711ae642b0d053c5168792f1832eeb15d1fdeb4b8d2efcfb4d9b9
+SHA512 (cassandane-00bfe01.tar.gz) = 96f2ca6cbf36c8f9df2b4762ca572b5ba597ca305408f992d6671cba2845f990c8d3cf35ae91ea44da9ea825c9b4c6b1e5fb314b27c31cf4c63805699ab46ab6