diff --git a/tests/compatibility_issues.py b/tests/compatibility_issues.py
index 6cfdd3e..102ed7e 100644
--- a/tests/compatibility_issues.py
+++ b/tests/compatibility_issues.py
@@ -313,10 +313,7 @@
     #'no_journal', ## it threw a 500 internal server error! ## for old versions
     #'nofreebusy', ## for old versions
     'fragile_sync_tokens', ## no issue raised yet
-    'vtodo_datesearch_nodtstart_task_is_skipped_in_closed_date_range', ## no issue raised yet
-    'isnotdefined_not_working', ## https://gitlab.com/davical-project/davical/-/issues/281
-    'fastmail_buggy_noexpand_date_search', ## https://gitlab.com/davical-project/davical/-/issues/280
-    "isnotdefined_not_working",
+    'vtodo_datesearch_nodtstart_task_is_skipped', ## no issue raised yet
 ]
 
 google = [
@@ -387,6 +384,7 @@
     'no_journal',
     'no_recurring_todo',
     'no_sync_token',
+    'combined_search_not_working'
 ]
 
 
diff --git a/tests/test_caldav.py b/tests/test_caldav.py
index fac5774..c43ba5c 100644
--- a/tests/test_caldav.py
+++ b/tests/test_caldav.py
@@ -1297,15 +1297,10 @@ def testSearchEvent(self):
                 start=datetime(2006, 7, 13, 13, 0),
                 end=datetime(2006, 7, 15, 13, 0),
             )
-            if not self.check_compatibility_flag(
+            if (not self.check_compatibility_flag(
                 "category_search_yields_nothing"
-            ) and not self.check_compatibility_flag("combined_search_not_working"):
-                if self.check_compatibility_flag("fastmail_buggy_noexpand_date_search"):
-                    ## fastmail and davical delivers too many recurring events on a date search
-                    ## (but fastmail anyway won't get here, as combined search is not working with fastmail)
-                    assert len(no_events) == 1
-                else:
-                    assert len(no_events) == 1
+            ) and not self.check_compatibility_flag("combined_search_not_working")):
+                assert len(no_events) == 0
             some_events = c.search(
                 comp_class=Event,
                 category="PERSONAL",