diff --git a/documentation/src/test/java/org/hibernate/userguide/naming/AcmeCorpPhysicalNamingStrategyTest.java b/documentation/src/test/java/org/hibernate/userguide/naming/AcmeCorpPhysicalNamingStrategyTest.java
index 07f32083dc..1b69f845a5 100644
--- a/documentation/src/test/java/org/hibernate/userguide/naming/AcmeCorpPhysicalNamingStrategyTest.java
+++ b/documentation/src/test/java/org/hibernate/userguide/naming/AcmeCorpPhysicalNamingStrategyTest.java
@@ -9,8 +9,10 @@ package org.hibernate.userguide.naming;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
+import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,7 +29,9 @@ public class AcmeCorpPhysicalNamingStrategyTest {
 
 	@Before
 	public void prepareServiceRegistry() {
-		serviceRegistry = new StandardServiceRegistryBuilder().build();
+		serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting(AvailableSettings.CONNECTION_PROVIDER, SharedDriverManagerConnectionProviderImpl.getInstance())
+				.build();
 	}
 
 	@After
diff --git a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java
index 6a55d6400a..c4fa37a0d5 100644
--- a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java
+++ b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java
@@ -20,6 +20,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 
+import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.junit.Test;
 
 /**
@@ -36,12 +37,23 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Test
 	public void jdbc() {
+		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting(AvailableSettings.CONNECTION_PROVIDER, SharedDriverManagerConnectionProviderImpl.getInstance())
+				// "jdbc" is the default, but for explicitness
+				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jdbc")
+				.build();
+
+		/*
 		//tag::transactions-api-jdbc-example[]
 		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
 				// "jdbc" is the default, but for explicitness
 				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jdbc")
 				.build();
 
+		//end::transactions-api-jdbc-example[]
+        */
+
+		//tag::transactions-api-jdbc-example[]
 		Metadata metadata = new MetadataSources(serviceRegistry)
 				.addAnnotatedClass(Customer.class)
 				.getMetadataBuilder()
@@ -81,12 +93,23 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Test
 	public void cmt() {
+		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting(AvailableSettings.CONNECTION_PROVIDER, SharedDriverManagerConnectionProviderImpl.getInstance())
+				// "jdbc" is the default, but for explicitness
+				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta")
+				.build();
+
+		/*
 		//tag::transactions-api-cmt-example[]
 		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
 				// "jdbc" is the default, but for explicitness
 				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta")
 				.build();
 
+		//end::transactions-api-cmt-example[]
+		*/
+
+		//tag::transactions-api-cmt-example[]
 		Metadata metadata = new MetadataSources(serviceRegistry)
 				.addAnnotatedClass(Customer.class)
 				.getMetadataBuilder()
@@ -131,12 +154,23 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Test
 	public void bmt() {
+		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting(AvailableSettings.CONNECTION_PROVIDER, SharedDriverManagerConnectionProviderImpl.getInstance())
+				// "jdbc" is the default, but for explicitness
+				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta")
+				.build();
+
+		/*
 		//tag::transactions-api-bmt-example[]
 		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
 				// "jdbc" is the default, but for explicitness
 				.applySetting(AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta")
 				.build();
 
+		//end::transactions-api-bmt-example[]
+		*/
+
+		//tag::transactions-api-bmt-example[]
 		Metadata metadata = new MetadataSources(serviceRegistry)
 				.addAnnotatedClass(Customer.class)
 				.getMetadataBuilder()