diff --git a/hibernate-core/src/test/java/org/hibernate/engine/spi/NonSortedExecutableListTest.java b/hibernate-core/src/test/java/org/hibernate/engine/spi/NonSortedExecutableListTest.java
index a20ff803eb..2a4188eeb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/engine/spi/NonSortedExecutableListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/engine/spi/NonSortedExecutableListTest.java
@@ -88,7 +88,7 @@ public class NonSortedExecutableListTest extends BaseUnitTestCase {
 		}
 
 		@Override
-		public void afterDeserialize(SharedSessionContractImplementor session) {
+		public void afterDeserialize(SessionImplementor session) {
 			this.afterDeserializeCalled = true;
 		}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeComparableIdTest.java
index 16ce89e47d..eb27ad4a1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeComparableIdTest.java
@@ -25,7 +25,7 @@ import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.type.LongType;
@@ -142,7 +142,7 @@ public class UserTypeComparableIdTest extends BaseCoreFunctionalTestCase {
 		public Object nullSafeGet(
 				ResultSet resultSet,
 				String[] names,
-				SharedSessionContractImplementor sessionImplementor,
+				SessionImplementor sessionImplementor,
 				Object o) throws HibernateException, SQLException {
 			Long value = resultSet.getLong( names[0] );
 
@@ -154,7 +154,7 @@ public class UserTypeComparableIdTest extends BaseCoreFunctionalTestCase {
 				PreparedStatement preparedStatement,
 				Object value,
 				int index,
-				SharedSessionContractImplementor sessionImplementor) throws HibernateException, SQLException {
+				SessionImplementor sessionImplementor) throws HibernateException, SQLException {
 			CustomId customId = (CustomId) value;
 
 			if ( customId == null ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeNonComparableIdTest.java
index 48ea325ff3..facff35492 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeNonComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/UserTypeNonComparableIdTest.java
@@ -10,7 +10,6 @@ import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Comparator;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -23,7 +22,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.type.LongType;
@@ -131,7 +130,7 @@ public class UserTypeNonComparableIdTest extends BaseCoreFunctionalTestCase {
 		public Object nullSafeGet(
 				ResultSet resultSet,
 				String[] names,
-				SharedSessionContractImplementor sessionImplementor,
+				SessionImplementor sessionImplementor,
 				Object o) throws HibernateException, SQLException {
 			Long value = resultSet.getLong( names[0] );
 
@@ -143,7 +142,7 @@ public class UserTypeNonComparableIdTest extends BaseCoreFunctionalTestCase {
 				PreparedStatement preparedStatement,
 				Object value,
 				int index,
-				SharedSessionContractImplementor sessionImplementor) throws HibernateException, SQLException {
+				SessionImplementor sessionImplementor) throws HibernateException, SQLException {
 			CustomId customId = (CustomId) value;
 
 			if ( customId == null ) {