diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/KC_GCMTests.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/KC_GCMTests.java
index 838df97e..9e77e20e 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/KC_GCMTests.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/KC_GCMTests.java
@@ -59,7 +59,7 @@
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class KC_GCMTests {
-    private static String sharedObjectKeyBase = "test-gcm-kms";
+    private static String sharedObjectKeyBase = "test-kc-gcm-kms";
     private static KeyMaterial kmsKeyArn = KeyMaterial.builder()
     .kmsKeyId(TestUtils.KMS_KEY_ARN)
     .build();
diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk
index 5d67d8f3..8f550866 160000
--- a/test-server/ruby-v2-server/local-ruby-sdk
+++ b/test-server/ruby-v2-server/local-ruby-sdk
@@ -1 +1 @@
-Subproject commit 5d67d8f3d3c80b34cda643b83f189abe322ac4b4
+Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828
diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk
index 5d67d8f3..8f550866 160000
--- a/test-server/ruby-v3-server/local-ruby-sdk
+++ b/test-server/ruby-v3-server/local-ruby-sdk
@@ -1 +1 @@
-Subproject commit 5d67d8f3d3c80b34cda643b83f189abe322ac4b4
+Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828