diff --git a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/CopyObjectTest.cs b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/CopyObjectTest.cs
index fff60f755592..6a003fc390fa 100644
--- a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/CopyObjectTest.cs
+++ b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/CopyObjectTest.cs
@@ -126,8 +126,8 @@ public void MetadataOverride()
         [Fact]
         public void CopyObjectWithObjectContexts()
         {
-            string contextKey = "A\u00F1\u03A9\U0001F680";
-            string contextValue = "Ab\u00F1\u03A9\U0001F680";
+            string contextKey = "A\u00F1\u03A9\U0001F681";
+            string contextValue = "Ab\u00F1\u03A9\U0001F681";
             var custom = new Dictionary<string, ObjectCustomContextPayload>
             {
                   { contextKey, new ObjectCustomContextPayload { Value = contextValue } }
diff --git a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/ListObjectsTest.cs b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/ListObjectsTest.cs
index de7e864da133..760aa01df4b4 100644
--- a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/ListObjectsTest.cs
+++ b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/ListObjectsTest.cs
@@ -128,8 +128,8 @@ public void PartialResponses()
         [Fact]
         public void ListObjectsMatchingContextKeyValuePair()
         {
-            string contextKey = "A\u00F1\u03A9\U0001F680";
-            string contextValue = "Ab\u00F1\u03A9\U0001F680";
+            string contextKey = "A\u00F1\u03A9\U0001F683";
+            string contextValue = "Ab\u00F1\u03A9\U0001F683";
             var custom = new Dictionary<string, ObjectCustomContextPayload>
             {
                 { contextKey, new ObjectCustomContextPayload { Value = contextValue } }
@@ -137,7 +137,7 @@ public void ListObjectsMatchingContextKeyValuePair()
             };
             var destination = new Object
             {
-                Bucket = _fixture.ReadBucket,
+                Bucket = _fixture.SingleVersionBucket,
                 Name = IdGenerator.FromGuid(),
                 Contexts = new Object.ContextsData { Custom = custom }
             };
@@ -146,7 +146,7 @@ public void ListObjectsMatchingContextKeyValuePair()
             _fixture.Client.UploadObject(destination, source);
             string filter = $@"contexts.""{contextKey}""=""{contextValue}""";
             var options = new ListObjectsOptions { Filter = filter };
-            var objects = _fixture.Client.ListObjects(_fixture.ReadBucket, options: options).ToList();
+            var objects = _fixture.Client.ListObjects(_fixture.SingleVersionBucket, options: options).ToList();
             var obj = Assert.Single(objects);
             var fetchedContext = Assert.Single(obj.Contexts.Custom);
             Assert.Equal(contextKey, fetchedContext.Key);
diff --git a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/PatchObjectTest.cs b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/PatchObjectTest.cs
index 3d00cf99fe93..824eefd83106 100644
--- a/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/PatchObjectTest.cs
+++ b/apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.IntegrationTests/PatchObjectTest.cs
@@ -61,7 +61,7 @@ public void ClearAllObjectContexts()
             var client = _fixture.Client;
             var custom = new Dictionary<string, ObjectCustomContextPayload>
             {
-                  { "A\u00F1\u03A9\U0001F680", new ObjectCustomContextPayload { Value = "Ab\u00F1\u03A9\U0001F680" } }
+                  { "A\u00F1\u03A9\U0001F682", new ObjectCustomContextPayload { Value = "Ab\u00F1\u03A9\U0001F682" } }
             };
 
             var destination = new Object