   (s/only-with-real-database
    ;; Disable message publishing so items are not indexed as part of the initial save.
    (dev-sys-util/eval-in-dev-sys `(cmr.metadata-db.config/set-publish-messages! false))
-   (let [
-         acl1 (save-acl 1
+
+   ;; Remove fixture ACLs
+   (let [response (ac/search-for-acls (u/conn-context) {} {:token (tc/echo-system-token)})
+         items (:items response)]
+     (doseq [acl items]
+       (e/ungrant (s/context) (:concept_id acl))))
+
+   (let [acl1 (save-acl 1
                         {:extra-fields {:acl-identity "system:token"
                                         :target-provider-id "PROV1"}}
                         "TOKEN")

          (search-results-match? items [acl2]))

        ;; Groups
        (let [response (ac/search-for-groups (u/conn-context) {})
              ;; Need to filter out admin group created by fixture
              items (filter #(not (= "mock-admin-group-guid" (:legacy_guid %))) (:items response))]
          (search-results-match? items [group2]))

  (s/only-with-real-database
    ;; Disable message publishing so items are not indexed.
    (dev-sys-util/eval-in-dev-sys `(cmr.metadata-db.config/set-publish-messages! false))

    ;; Remove fixture ACLs
    (let [response (ac/search-for-acls (u/conn-context) {} {:token (tc/echo-system-token)})
          items (:items response)]
      (doseq [acl items]
        (e/ungrant (s/context) (:concept_id acl))))

    (let [;; saved but not indexed
          coll1 (save-collection 1)
          coll2 (save-collection 2 {:revision-date "3016-01-01T10:00:00Z"})
