diff --git a/tests/Doctrine/Tests/Mocks/ConnectionCommitFailMock.php b/tests/Doctrine/Tests/Mocks/ConnectionCommitFailMock.php
deleted file mode 100644
index c31b50bf4f7..00000000000
--- a/tests/Doctrine/Tests/Mocks/ConnectionCommitFailMock.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Mocks;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\Statement;
-
-/**
- * Mock class for Connection.
- */
-class ConnectionCommitFailMock extends ConnectionMock
-{
-    /**
-     * Return false to raise an error
-     *
-     * @return bool
-     */
-    public function commit()
-    {
-        return false;
-    }
-}
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index 23bf21f7ed6..fa8e5df1013 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -798,11 +798,12 @@ public function testPreviousDetectedIllegalNewNonCascadedEntitiesAreCleanedUpOnS
     public function testCommitThrowOptimisticLockExceptionWhenConnectionCommitReturnFalse(): void
     {
         // Set another connection mock that fail on commit
-        $this->_connectionMock = new ConnectionCommitFailMock([], new DriverMock());
-        $this->eventManager = $this->getMockBuilder(EventManager::class)->getMock();
-        $this->_emMock = EntityManagerMock::create($this->_connectionMock, null, $this->eventManager);
-        $this->_unitOfWork = new UnitOfWorkMock($this->_emMock);
-        $this->_emMock->setUnitOfWork($this->_unitOfWork);
+        $this->_connectionMock = $this->getMockBuilder(ConnectionMock::class)
+            ->setConstructorArgs([[], new DriverMock()])
+            ->setMethods(['commit'])
+            ->getMock();
+
+        $this->_connectionMock->method('commit')->willReturn(false);
 
         // Setup fake persister and id generator
         $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(ForumUser::class));