diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
index 1d6144933..d69a49c5f 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
@@ -368,7 +368,7 @@ namespace TestSuite.ApiTests
 
 
             // STEP 4: Check tags
-            var tags = await _.Assets.WaitForTagsAsync(_.AppName, metadataRequest.Tags[0], TimeSpan.FromMinutes(2));
+            var tags = await _.Assets.WaitForTagsAsync(_.AppName, tag1, TimeSpan.FromMinutes(2));
 
             Assert.Equal(1, tags?[tag1]);
             Assert.Equal(1, tags?[tag2]);
diff --git a/backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs b/backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs
index 2dac2672c..7e111b203 100644
--- a/backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs
+++ b/backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs
@@ -60,7 +60,7 @@ namespace TestSuite
             {
             }
 
-            return null;
+            return await assetsClient.GetTagsAsync(app);
         }
 
         public static async Task<BackupJobDto> WaitForBackupAsync(this IBackupsClient backupsClient, string app, TimeSpan timeout)