diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
index 80fdff4715..5e018dc63e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
@@ -444,10 +444,8 @@ public void afterTransactionBegin() {
 
 	@Override
 	public void beforeTransactionCompletion() {
-		owner.beforeTransactionCompletion();
-		if ( getConnectionReleaseMode() == ConnectionReleaseMode.BEFORE_TRANSACTION_COMPLETION ) {
-			this.logicalConnection.beforeTransactionCompletion();
-		}
+		this.owner.beforeTransactionCompletion();
+		this.logicalConnection.beforeTransactionCompletion();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
index 9d916f38a5..2f0dc61b07 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
@@ -152,7 +152,6 @@ public void afterStatement() {
 	@Override
 	public void beforeTransactionCompletion() {
 		super.beforeTransactionCompletion();
-
 		if ( connectionHandlingMode.getReleaseMode() == ConnectionReleaseMode.BEFORE_TRANSACTION_COMPLETION ) {
 			log.debug( "Initiating JDBC connection release from beforeTransactionCompletion" );
 			releaseConnection();
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
index b1d2c7f997..70f66d1e14 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
@@ -36,8 +36,9 @@ public interface LogicalConnectionImplementor extends LogicalConnection {
 	void afterStatement();
 
 	/**
-	 * Notification indicating a transaction is about to completed to trigger
-	 * {@link org.hibernate.ConnectionReleaseMode#BEFORE_TRANSACTION_COMPLETION} releasing if needed
+	 * Notification indicating a transaction is about to be completed, so to trigger
+	 * releasing of the connection if needed ({@link org.hibernate.ConnectionReleaseMode#BEFORE_TRANSACTION_COMPLETION}
+	 * is enabled)
 	 */
 	void beforeTransactionCompletion();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/BeforeCompletionReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/BeforeCompletionReleaseTest.java
index c687cc3734..f932b558fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/BeforeCompletionReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/BeforeCompletionReleaseTest.java
@@ -43,7 +43,7 @@ public class BeforeCompletionReleaseTest extends BaseEntityManagerFunctionalTest
 
     @Override
     protected Map getConfig() {
-		Map config = super.getConfig();
+        Map config = super.getConfig();
         TestingJtaBootstrap.prepare( config );
         config.put( AvailableSettings.CONNECTION_PROVIDER, new ConnectionProviderDecorator() );
         config.put( AvailableSettings.CONNECTION_HANDLING, PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION );