diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java b/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
index 5d65c46dd..55d4db17e 100644
--- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
+++ b/DocumentsFromSnapshotMigration/src/test/java/com/rfs/FullTest.java
@@ -9,17 +9,17 @@
 import com.rfs.common.DocumentReindexer;
 import com.rfs.common.FileSystemRepo;
 import com.rfs.common.FileSystemSnapshotCreator;
-import com.rfs.common.GlobalMetadata;
-import com.rfs.common.IndexMetadata;
 import com.rfs.common.LuceneDocumentsReader;
 import com.rfs.common.OpenSearchClient;
 import com.rfs.common.RestClient;
-import com.rfs.common.ShardMetadata;
 import com.rfs.common.SnapshotRepo;
 import com.rfs.common.SnapshotShardUnpacker;
 import com.rfs.common.SourceRepo;
 import com.rfs.framework.SearchClusterContainer;
 import com.rfs.framework.PreloadedSearchClusterContainer;
+import com.rfs.models.GlobalMetadata;
+import com.rfs.models.IndexMetadata;
+import com.rfs.models.ShardMetadata;
 import com.rfs.transformers.TransformFunctions;
 import com.rfs.transformers.Transformer;
 import com.rfs.version_es_7_10.ElasticsearchConstants_ES_7_10;
diff --git a/RFS/src/test/java/com/rfs/framework/ClusterOperations.java b/RFS/src/test/java/com/rfs/framework/ClusterOperations.java
index 531a3c30a..18b50f7f7 100644
--- a/RFS/src/test/java/com/rfs/framework/ClusterOperations.java
+++ b/RFS/src/test/java/com/rfs/framework/ClusterOperations.java
@@ -36,7 +36,7 @@ public void createSnapshotRepository() throws IOException {
         final var repositoryJson = "{\n" +
         "  \"type\": \"fs\",\n" +
         "  \"settings\": {\n" +
-        "    \"location\": \"/usr/share/elasticsearch/snapshots\",\n" +
+        "    \"location\": \"" + SearchClusterContainer.CLUSTER_SNAPSHOT_DIR + "\",\n" +
         "    \"compress\": false\n" +
         "  }\n" +
         "}";