diff --git a/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java b/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java
index adaf2a186..ba9ca10f6 100644
--- a/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java
+++ b/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java
@@ -608,7 +608,7 @@ public void ConnDC_UC6() {
                 willPacketBuilder.withQOS(QOS.AT_LEAST_ONCE).withPayload("Hello World".getBytes()).withTopic("test/topic");
 
                 ConnectPacketBuilder connectBuilder = new ConnectPacketBuilder();
-                connectBuilder.withClientId("MQTT5 CRT" + UUID.randomUUID().toString());
+                connectBuilder.withClientId("MQTT5 CRT");
                 connectBuilder.withKeepAliveIntervalSeconds(1000L);
                 connectBuilder.withMaximumPacketSizeBytes(1000L);
                 connectBuilder.withPassword(AWS_TEST_MQTT5_BASIC_AUTH_PASSWORD.getBytes());
@@ -876,7 +876,7 @@ public void ConnWS_UC6() {
                 willPacketBuilder.withQOS(QOS.AT_LEAST_ONCE).withPayload("Hello World".getBytes()).withTopic("test/topic");
 
                 ConnectPacketBuilder connectBuilder = new ConnectPacketBuilder();
-                connectBuilder.withClientId("MQTT5 CRT"+UUID.randomUUID().toString());
+                connectBuilder.withClientId("MQTT5 CRT");
                 connectBuilder.withKeepAliveIntervalSeconds(1000L);
                 connectBuilder.withMaximumPacketSizeBytes(1000L);
                 connectBuilder.withPassword(AWS_TEST_MQTT5_BASIC_AUTH_PASSWORD.getBytes());
@@ -1984,7 +1984,6 @@ public void Negotiated_Rejoin_Always() {
                         events.connectSuccessSettings.getRejoinedSession());
 
                 client.stop(new DisconnectPacketBuilder().build());
-                events.stopFuture.get();
             }
 
             builder.withSessionBehavior(ClientSessionBehavior.REJOIN_ALWAYS);