diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
index 2ef4ba238b..81806f627f 100644
--- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
+++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
@@ -1,6 +1,6 @@
 package org.hibernate.test.cache.ehcache;
 
-import org.hibernate.cache.EhCacheRegionFactory;
+import org.hibernate.cache.internal.EhCacheRegionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 
diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
index c1b76006df..0ae210e9b8 100644
--- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
+++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
@@ -1,7 +1,7 @@
 package org.hibernate.test.cache.ehcache;
 
-import org.hibernate.cache.EhCacheProvider;
-import org.hibernate.cache.ReadWriteCache;
+import org.hibernate.cache.spi.ReadWriteCache.Item;
+import org.hibernate.cache.internal.EhCacheProvider;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 
@@ -20,8 +20,8 @@ public class EhCacheRegionTest extends EhCacheTest {
 	@Override
 	protected Map getMapFromCacheEntry(final Object entry) {
 		final Map map;
-		if ( entry instanceof ReadWriteCache.Item ) {
-			map = (Map) ( (ReadWriteCache.Item) entry ).getValue();
+		if ( entry instanceof Item ) {
+			map = (Map) ( (Item) entry ).getValue();
 		}
 		else {
 			map = (Map) entry;