diff --git a/DocumentsFromSnapshotMigration/build-preloaded-source-image.gradle b/DocumentsFromSnapshotMigration/build-preloaded-source-image.gradle
index 8138bd459..695754562 100644
--- a/DocumentsFromSnapshotMigration/build-preloaded-source-image.gradle
+++ b/DocumentsFromSnapshotMigration/build-preloaded-source-image.gradle
@@ -22,6 +22,7 @@ def createNetworkTask = task createNetwork(type: Exec) {
         println 'Network created'
     }
 }
+
 task createInitialElasticsearchContainer(type: DockerCreateContainer) {
     dependsOn createNetwork, buildDockerImage_emptyElasticsearchSource_7_10
     targetImageId 'migrations/empty_elasticsearch_source_7_10:latest'
@@ -70,7 +71,7 @@ def sourceContainerCommitTask = task commitSourceContainer() {
 }
 
 task removeClientContainer(type: DockerRemoveContainer) {
-    dependsOn commitSourceContainer
+    dependsOn waitClientContainer
     targetContainerId createClientContainer.getContainerId()
 }
 startClientTask.finalizedBy(removeClientContainer)
diff --git a/DocumentsFromSnapshotMigration/build.gradle b/DocumentsFromSnapshotMigration/build.gradle
index f89f45f94..521799ae8 100644
--- a/DocumentsFromSnapshotMigration/build.gradle
+++ b/DocumentsFromSnapshotMigration/build.gradle
@@ -156,6 +156,7 @@ test {
 
 task slowTest(type: Test) {
     useJUnitPlatform()
+    dependsOn buildDockerImage_elasticsearchRFSSource
     jacoco {
         enabled = true
     }
diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java b/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
index 58a9949be..397622b00 100644
--- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
+++ b/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
@@ -57,6 +57,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -75,7 +76,7 @@ public class FullTest {
             Pattern.compile("(?:\\S+\\s+){2}(\\S+)\\s+(?:\\S+\\s+){3}(\\S+)");
 
     public static Stream<Arguments> makeArgs() {
-        var sourceImageNames = List.of("elasticsearch_rfs_source");
+        var sourceImageNames = List.of("migrations/elasticsearch_rfs_source");
         var targetImageNames = List.of("opensearchproject/opensearch:2.13.0", "opensearchproject/opensearch:1.3.0");
         var numWorkers = List.of(1, 3, 40);
         return sourceImageNames.stream()
@@ -155,7 +156,10 @@ private void checkClusterMigrationOnFinished(ElasticsearchContainer esSourceCont
     }
 
     private Map<String,Integer> getIndexToCountMap(RestClient client) {;
-        var lines = client.get("_cat/indices").body.split("\n");
+        var lines = Optional.ofNullable(client.get("_cat/indices"))
+                .flatMap(r->Optional.ofNullable(r.body))
+                .map(b->b.split("\n"))
+                .orElse(new String[0]);
         return Arrays.stream(lines)
                 .map(line -> {
                     var matcher = CAT_INDICES_INDEX_COUNT_PATTERN.matcher(line);