diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
index 922f04400..c407e2e3c 100644
--- a/tests/Elasticsearch/Tests/YamlRunnerTest.php
+++ b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -826,6 +826,46 @@ private function clean()
         $response = curl_exec($ch);
         curl_close($ch);
 
+        $ch = curl_init($host."/_snapshot/_all");
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
+        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+
+        $response = curl_exec($ch);
+        curl_close($ch);
+        if ($response != "{}") {
+            $response = json_decode($response, true);
+            foreach ($response as $repo => $settings) {
+                if ($settings['type'] == 'fs') {
+                    $ch = curl_init($host."/_snapshot/$repo/_all?ignore_unavailable");
+                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
+                    curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+
+                    $snapshots = json_decode(curl_exec($ch), true);
+                    curl_close($ch);
+                    foreach ($snapshots['snapshots'] as $snapshot) {
+                        $snapshotName = $snapshot['snapshot'];
+                        $ch = curl_init($host."/_snapshot/$repo/$snapshotName");
+                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
+                        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+
+                        $response = curl_exec($ch);
+                        curl_close($ch);
+                    }
+                    $ch = curl_init($host."/_snapshot/$repo");
+                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
+                    curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+
+                    $response = curl_exec($ch);
+                    curl_close($ch);
+
+                }
+            }
+        }
+
         // TODO ewwww...
         shell_exec('rm -rf /tmp/test_repo_create_1_loc');
         shell_exec('rm -rf /tmp/test_repo_restore_1_loc');