diff --git a/tests/default/_core/update_by_query.yaml b/tests/default/_core/update_by_query/rethrottle.yaml
similarity index 74%
rename from tests/default/_core/update_by_query.yaml
rename to tests/default/_core/update_by_query/rethrottle.yaml
index 40a1ad72..d1f27c0d 100644
--- a/tests/default/_core/update_by_query.yaml
+++ b/tests/default/_core/update_by_query/rethrottle.yaml
@@ -1,8 +1,8 @@
-$schema: ../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../json_schemas/test_story.schema.yaml
 
-description: Test Update By Query endpoint.
+description: Test Update By Query rethrottle endpoint.
 prologues:
-  - path: /books/_delete_by_query
+  - path: /books/_update_by_query
     id: task
     method: POST
     parameters:
diff --git a/tests/snapshot/snapshot/snapshot.yaml b/tests/snapshot/snapshot/snapshot.yaml
index abfc2198..79e6bb59 100644
--- a/tests/snapshot/snapshot/snapshot.yaml
+++ b/tests/snapshot/snapshot/snapshot.yaml
@@ -6,19 +6,19 @@ epilogues:
     method: DELETE
     status: [200, 404]
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-test-snapshot
   - path: /_snapshot/{repository}/{snapshot}
     method: DELETE
     status: [200, 404]
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-second-snapshot
   - path: /_snapshot/{repository}
     method: DELETE
     status: [200, 404]
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
 chapters:
   - synopsis: Create and update a snapshot repository.
     path: /_snapshot/{repository}
@@ -26,7 +26,7 @@ chapters:
       - POST
       - PUT
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
     request:
       payload:
         type: fs
@@ -38,7 +38,7 @@ chapters:
     response:
       status: 200
       payload:
-        my-repository:
+        my-fs-repository:
           type: fs
           settings:
             location: /tmp/opensearch/repo
@@ -46,11 +46,11 @@ chapters:
     path: /_snapshot/{repository}
     method: GET
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
     response:
       status: 200
       payload:
-        my-repository:
+        my-fs-repository:
           type: fs
           settings:
             location: /tmp/opensearch/repo
@@ -58,7 +58,7 @@ chapters:
     path: /_snapshot/{repository}/{snapshot}
     method: PUT
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-test-snapshot
       wait_for_completion: true
     request:
@@ -76,7 +76,7 @@ chapters:
     path: /_snapshot/{repository}/{snapshot}
     method: POST
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-second-snapshot
       wait_for_completion: true
     request:
@@ -91,7 +91,7 @@ chapters:
     path: /_snapshot/{repository}/{snapshot}
     method: GET
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-test-snapshot
     response:
       status: 200
@@ -102,7 +102,7 @@ chapters:
     path: /_snapshot/{repository}/{snapshot}
     method: GET
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-second-snapshot
       human: true
     response:
@@ -114,10 +114,10 @@ chapters:
     path: /_snapshot/{repository}/{snapshot}
     method: DELETE
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
       snapshot: my-test-snapshot
   - synopsis: Delete a snapshot repository.
     path: /_snapshot/{repository}
     method: DELETE
     parameters:
-      repository: my-repository
+      repository: my-fs-repository
diff --git a/tests/snapshot/snapshot/status.yaml b/tests/snapshot/snapshot/status.yaml
index af00860d..bc93b334 100644
--- a/tests/snapshot/snapshot/status.yaml
+++ b/tests/snapshot/snapshot/status.yaml
@@ -34,6 +34,8 @@ prologues:
         ignore_unavailable: true
         include_global_state: false
         partial: true
+    retry:
+      count: 3
 chapters:
   - synopsis: Get status of all running snapshots.
     path: /_snapshot/_status