diff --git a/meilisearch/tests/common/index.rs b/meilisearch/tests/common/index.rs
index 381bd1cb4..784067c2d 100644
--- a/meilisearch/tests/common/index.rs
+++ b/meilisearch/tests/common/index.rs
@@ -272,6 +272,20 @@ impl<'a> Index<'a, Shared> {
         }
         (task, code)
     }
+
+    pub async fn delete_index_fail(&self) -> (Value, StatusCode) {
+        let (mut task, code) = self._delete().await;
+        if code.is_success() {
+            task = self.wait_task(task.uid()).await;
+            if task.is_success() {
+                panic!(
+                    "`delete_index_fail` succeeded: {}",
+                    serde_json::to_string_pretty(&task).unwrap()
+                );
+            }
+        }
+        (task, code)
+    }
 }
 
 #[allow(dead_code)]
@@ -314,6 +328,12 @@ impl<State> Index<'_, State> {
         });
         self.service.post_encoded("/indexes", body, self.encoder).await
     }
+
+    pub(super) async fn _delete(&self) -> (Value, StatusCode) {
+        let url = format!("/indexes/{}", urlencode(self.uid.as_ref()));
+        self.service.delete(url).await
+    }
+
     pub async fn wait_task(&self, update_id: u64) -> Value {
         // try several times to get status, or panic to not wait forever
         let url = format!("/tasks/{}", update_id);
diff --git a/meilisearch/tests/index/delete_index.rs b/meilisearch/tests/index/delete_index.rs
index e404a6003..03185d21a 100644
--- a/meilisearch/tests/index/delete_index.rs
+++ b/meilisearch/tests/index/delete_index.rs
@@ -1,51 +1,50 @@
-use crate::common::Server;
+use crate::common::{shared_does_not_exists_index, Server};
 use crate::json;
 
 #[actix_rt::test]
 async fn create_and_delete_index() {
-    let server = Server::new().await;
-    let index = server.index("test");
-    let (_response, code) = index.create(None).await;
+    let server = Server::new_shared();
+    let index = server.unique_index();
+    let (response, code) = index.create(None).await;
 
     assert_eq!(code, 202);
 
-    index.wait_task(0).await;
+    index.wait_task(response.uid()).await.succeeded();
 
     assert_eq!(index.get().await.1, 200);
 
-    let (_response, code) = index.delete().await;
+    let (response, code) = index.delete().await;
 
     assert_eq!(code, 202);
 
-    index.wait_task(1).await;
+    index.wait_task(response.uid()).await.succeeded();
 
     assert_eq!(index.get().await.1, 404);
 }
 
 #[actix_rt::test]
 async fn error_delete_unexisting_index() {
-    let server = Server::new().await;
-    let index = server.index("test");
-    let (_, code) = index.delete().await;
+    let index = shared_does_not_exists_index().await;
+    let (task, code) = index.delete_index_fail().await;
 
     assert_eq!(code, 202);
 
     let expected_response = json!({
-        "message": "Index `test` not found.",
+        "message": "Index `DOES_NOT_EXISTS` not found.",
         "code": "index_not_found",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#index_not_found"
     });
 
-    let response = index.wait_task(0).await;
+    let response = index.wait_task(task.uid()).await;
     assert_eq!(response["status"], "failed");
     assert_eq!(response["error"], expected_response);
 }
 
 #[actix_rt::test]
 async fn loop_delete_add_documents() {
-    let server = Server::new().await;
-    let index = server.index("test");
+    let server = Server::new_shared();
+    let index = server.unique_index();
     let documents = json!([{"id": 1, "field1": "hello"}]);
     let mut tasks = Vec::new();
     for _ in 0..50 {