diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapper.java
index 7a7f5b6c89..ad233abcc4 100644
--- a/jbt/src/main/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapper.java
+++ b/jbt/src/main/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapper.java
@@ -31,7 +31,12 @@ public Map<String, EntityPersister> getAllClassMetadata() {
 	}
 
 	public Map<String, CollectionPersister> getAllCollectionMetadata() {
-		return getMetamodel().collectionPersisters();
+		Map<String, CollectionPersister> origin = getMetamodel().collectionPersisters();
+		Map<String, CollectionPersister> result = new HashMap<String, CollectionPersister>(origin.size());
+		for (String key : origin.keySet()) {
+			result.put(key, (CollectionPersister)CollectionPersisterWrapperFactory.create(origin.get(key)));
+		}
+		return result;
 	}
 
 	public EntityPersister getClassMetadata(String string) {
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/EntityPersisterWrapperFactoryTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/EntityPersisterWrapperFactoryTest.java
index 7fcc25fe8c..061e427610 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/EntityPersisterWrapperFactoryTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/EntityPersisterWrapperFactoryTest.java
@@ -16,7 +16,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -163,12 +162,6 @@ public void testGetIdentifier() {
 		assertSame("bar", identifier);
 	}
 	
-
-
-	
-	
-	
-	
 	@Test
 	public void testIsInstanceOfAbstractEntityPersister() throws Exception {
 		Object dummyEntityPersister = EntityPersisterWrapperFactory.create(createTestEntityPersister());
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapperTest.java
index 39877e9cbc..c7c888371f 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/SessionFactoryWrapperTest.java
@@ -103,7 +103,9 @@ public void testGetAllClassMetadata() throws Exception {
 	public void testGetAllCollectionMetadata() throws Exception {
 		Map<String, CollectionPersister> allCollectionMetadata = sessionFactoryWrapper.getAllCollectionMetadata();
 		assertEquals(1, allCollectionMetadata.size());
-		assertNotNull(allCollectionMetadata.get(Foo.class.getName() + ".bars"));
+		CollectionPersister barsPersister = allCollectionMetadata.get(Foo.class.getName() + ".bars");
+		assertNotNull(barsPersister);
+		assertTrue(barsPersister instanceof Wrapper);
 	}
 	
 
@@ -122,7 +124,9 @@ public void testGetClassMetadata() throws Exception {
 	@Test
 	public void testGetCollectionMetadata() throws Exception {
 		assertNull(sessionFactoryWrapper.getCollectionMetadata("bars"));
-		assertNotNull(sessionFactoryWrapper.getCollectionMetadata(Foo.class.getName() + ".bars"));
+		CollectionPersister barsPersister = sessionFactoryWrapper.getCollectionMetadata(Foo.class.getName() + ".bars");
+		assertNotNull(barsPersister);
+		assertTrue(barsPersister instanceof Wrapper);
 	}	
 	
 }