diff --git a/test/InterversionTests/SmugglerTests.cs b/test/InterversionTests/SmugglerTests.cs
index 2333391757bb..b4274d4b23f3 100644
--- a/test/InterversionTests/SmugglerTests.cs
+++ b/test/InterversionTests/SmugglerTests.cs
@@ -13,6 +13,7 @@
 using Raven.Client.Documents.Smuggler;
 using Raven.Client.ServerWide;
 using Raven.Client.ServerWide.Operations;
+using Raven.Server.Config;
 using Raven.Server.Documents;
 using Raven.Server.Smuggler.Migration;
 using Raven.Tests.Core.Utils.Entities;
@@ -397,8 +398,12 @@ public async Task CanMigrateFrom54ToCurrent()
         public async Task CanMigrateFromCurrentTo42()
         {
             using var store42 = await GetDocumentStoreAsync(Server42Version);
-            using var storeCurrent = GetDocumentStore();
-
+            using var storeCurrent = GetDocumentStore(new Options
+            {
+                // workaround for RavenDB-21687
+                ModifyDatabaseRecord = record =>
+                    record.Settings[RavenConfiguration.GetKey(x => x.ExportImport.CompressionAlgorithm)] = "Gzip"
+            });
             storeCurrent.Maintenance.Send(new CreateSampleDataOperation());
             using (var session = storeCurrent.OpenAsyncSession())
             {
@@ -441,7 +446,12 @@ public async Task CanMigrateFromCurrentTo42()
         public async Task CanMigrateFromCurrentTo54()
         {
             using var store54 = await GetDocumentStoreAsync(Server54Version);
-            using var storeCurrent = GetDocumentStore();
+            using var storeCurrent = GetDocumentStore(new Options
+            {
+                // workaround for RavenDB-21687
+                ModifyDatabaseRecord = record => 
+                    record.Settings[RavenConfiguration.GetKey(x => x.ExportImport.CompressionAlgorithm)] = "Gzip"
+            });
 
             storeCurrent.Maintenance.Send(new CreateSampleDataOperation());
             using (var session = storeCurrent.OpenAsyncSession())