diff --git a/test/ctia/stores/es/init_test.clj b/test/ctia/stores/es/init_test.clj
index d5f44823b..550695d89 100644
--- a/test/ctia/stores/es/init_test.clj
+++ b/test/ctia/stores/es/init_test.clj
@@ -243,7 +243,7 @@
                 (is (= 2 (get-in config [:settings :number_of_shards])))
                 (is (= {} (select-keys (:mappings config) [:a :b]))))
               (finally
-                (clean-all conn)
+                #(es-helpers/clean-es-state! conn (str indexname "*"))
                 (conn/close conn)))))))))
 
 (deftest update-index-state-test
diff --git a/test/ctia/task/migration/store_test.clj b/test/ctia/task/migration/store_test.clj
index 021a35952..389d1b70c 100644
--- a/test/ctia/task/migration/store_test.clj
+++ b/test/ctia/task/migration/store_test.clj
@@ -665,7 +665,7 @@
                (is (= (+ nb-docs-1 nb-docs-2) (sut/store-size store))
                    "store size shall return the proper number of documents after second refresh"))
              (finally
-               (es-helpers/clean-es-state! % (str indexname "*"))))))))))
+               (es-helpers/clean-es-state! conn (str indexname "*"))))))))))
 
 (defn test-query-fetch-batch-events
   [{:keys [version] :as conn} services]