diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
index 138d9cd379..4eed240516 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
@@ -64,6 +64,9 @@ public class EntityWithMutableAttributesTest extends BaseNonConfigCoreFunctional
 
 	@Before
 	public void setUp() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = new User();
@@ -87,6 +90,9 @@ public class EntityWithMutableAttributesTest extends BaseNonConfigCoreFunctional
 
 	@After
 	public void tearDown() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					session.createQuery( "delete from User" ).executeUpdate();
@@ -97,6 +103,9 @@ public class EntityWithMutableAttributesTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testLoad() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = session.load( User.class, 1 );
@@ -114,6 +123,9 @@ public class EntityWithMutableAttributesTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testMutableAttributeIsUpdated() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = session.load( User.class, 1 );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
index 2d28ef1c29..668da7bb97 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
@@ -63,6 +63,9 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 
 	@Before
 	public void setUp() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = new User();
@@ -90,7 +93,10 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 	}
 
 	@After
-	public void tearDwon() {
+	public void tearDown() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					session.createQuery( "delete from SamplingOrder" ).executeUpdate();
@@ -103,6 +109,9 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 
 	@Test
 	public void testLoad() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					CriteriaBuilder cb = session.getCriteriaBuilder();
@@ -126,6 +135,9 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 
 	@Test
 	public void testAddUserRoles() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrder( session );
@@ -200,6 +212,9 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 
 	@Test
 	public void testDeleteUserRoles() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrder( session );
@@ -220,6 +235,9 @@ public class LoadAndUpdateEntitiesWithCollectionsTest extends BaseNonConfigCoreF
 
 	@Test
 	public void testModifyUserMail() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrder( session );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
index bdf0eab5fa..491eae665f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
@@ -63,6 +63,9 @@ public class SimpleDynamicUpdateTest extends BaseNonConfigCoreFunctionalTestCase
 
 	@Before
 	public void setUp() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = new User();
@@ -88,6 +91,9 @@ public class SimpleDynamicUpdateTest extends BaseNonConfigCoreFunctionalTestCase
 
 	@Test
 	public void testIt() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = session.getReference( User.class, 1 );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
index 24616b8834..a258efd8d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
@@ -66,6 +66,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Before
 	public void setUp() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					User user = new User();
@@ -92,7 +95,10 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 	}
 
 	@After
-	public void tearDwon() {
+	public void tearDown() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					session.createQuery( "delete from SamplingOrder" ).executeUpdate();
@@ -105,6 +111,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testLoad() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					CriteriaBuilder cb = session.getCriteriaBuilder();
@@ -128,6 +137,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testRemoveCustomers() {
+		if ( skipTest ) {
+			return;
+		}
 		Long samplingOrderId = fromTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrderFetchCustomer( session );
@@ -146,6 +158,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testAddUserRoles() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrderFetchCustomer( session );
@@ -207,6 +222,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testDeleteUserRoles() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrderFetchCustomer( session );
@@ -226,6 +244,9 @@ public class DynamicUpdateAndCollectionsTest extends BaseNonConfigCoreFunctional
 
 	@Test
 	public void testModifyUserMail() {
+		if ( skipTest ) {
+			return;
+		}
 		inTransaction(
 				session -> {
 					SamplingOrder samplingOrder = getSamplingOrderFetchCustomer( session );