diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
index 1efa6d20002..d3bbd850ae0 100644
--- a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
@@ -203,7 +203,6 @@ private void commitTransaction(final boolean resetTimeout) {
                         .execute(new CommitTransactionOperation(writeConcern,
                                 transactionState == TransactionState.COMMITTED)
                                 .recoveryToken(getRecoveryToken()), readConcern, this);
-                setTimeoutContext(null);
             }
         } catch (MongoException e) {
             clearTransactionContextOnError(e);
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
index 428c779f6cd..c2bc6c59411 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
@@ -56,7 +56,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Tag;
@@ -713,7 +712,6 @@ public void test10CustomTestWithTransactionUsesASingleTimeoutWithLock() {
     @Tag("setsFailPoint")
     @Test
     @DisplayName("Should ignore wTimeoutMS of WriteConcern to initial and subsequent commitTransaction operations")
-    @Disabled //TODO JAVA-5425
     public void shouldIgnoreWtimeoutMsOfWriteConcernToInitialAndSubsequentCommitTransactionOperations() {
         assumeTrue(serverVersionAtLeast(4, 4));
         assumeFalse(isStandalone());
@@ -738,7 +736,14 @@ public void shouldIgnoreWtimeoutMsOfWriteConcernToInitialAndSubsequentCommitTran
         }
         List<CommandStartedEvent> commandStartedEvents = commandListener.getCommandStartedEvents("commitTransaction");
         assertEquals(2, commandStartedEvents.size());
-        commandStartedEvents.forEach(e -> assertFalse(e.getCommand().containsKey("writeConcern")));
+
+        commandStartedEvents.forEach(e -> {
+            BsonDocument command = e.getCommand();
+            if (command.containsKey("writeConcern")) {
+                BsonDocument writeConcern = command.getDocument("writeConcern");
+                assertFalse(writeConcern.isEmpty());
+                assertFalse(writeConcern.containsKey("wTimeoutMS"));
+            }});
     }
 
     private static Stream<Arguments> test8ServerSelectionArguments() {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideOperationTimeoutTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideOperationTimeoutTest.java
index e039eed41d4..77caabfdbbb 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/ClientSideOperationTimeoutTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideOperationTimeoutTest.java
@@ -94,12 +94,6 @@ public static void checkSkipCSOTTest(final String fileDescription, final String
                 && testDescription.equals("timeoutMS can be overridden for close"));
 
         assumeFalse("TODO (CSOT) - JAVA-5259 No client.withTimeout", testDescription.endsWith("on client"));
-
-        assumeFalse("TODO (CSOT) - JAVA-4052", fileDescription.startsWith("timeoutMS behaves correctly for retryable operations"));
-        assumeFalse("TODO (CSOT) - JAVA-4052", fileDescription.startsWith("legacy timeouts behave correctly for retryable operations"));
-
-        assumeFalse("TODO (CSOT) - JAVA-4062", testDescription.contains("wTimeoutMS is ignored")
-          || testDescription.contains("ignores wTimeoutMS"));
     }
 
     private static final List<String> RACY_GET_MORE_TESTS = asList(