diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java
index 5d47bd2b40..9a718a2e6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java
@@ -10,17 +10,16 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
-import org.junit.Test;
-
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.proxy.HibernateProxy;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -984,340 +983,6 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest {
 		s.close();
 	}
 
-	@Test
-	@SuppressWarnings( {"unchecked"})
-	public void testDefaultReadOnlyWithModifiableFilterCollectionEntities() {
-		Container cOrig = createContainer();
-		Set expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						cOrig,
-						cOrig.getNoProxyInfo(),
-						cOrig.getProxyInfo(),
-						cOrig.getNonLazyInfo(),
-						cOrig.getNoProxyOwner(),
-						cOrig.getProxyOwner(),
-						cOrig.getNonLazyOwner(),
-						cOrig.getLazyDataPoints().iterator().next(),
-						cOrig.getNonLazyJoinDataPoints().iterator().next(),
-						cOrig.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		Set expectedReadOnlyObjects = new HashSet();
-
-		Session s = openSession();
-		assertFalse( s.isDefaultReadOnly() );
-		Transaction t = s.beginTransaction();
-		s.save( cOrig );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
-		assertNotSame( cOrig, c );
-		expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		expectedReadOnlyObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNoProxyInfo(),
-						c.getProxyInfo(),
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						//c.getLazyDataPoints(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		List list = s.createFilter( c.getLazyDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( false )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( false )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( false )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		t.commit();
-		s.close();
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("delete from DataPoint").executeUpdate();
-		s.createQuery("delete from Container").executeUpdate();
-		s.createQuery("delete from Info").executeUpdate();
-		s.createQuery("delete from Owner").executeUpdate();
-		t.commit();
-		s.close();
-	}
-
-	@SuppressWarnings( {"unchecked"})
-	@Test
-	public void testDefaultModifiableWithReadOnlyFilterCollectionEntities() {
-		Container cOrig = createContainer();
-		Set expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						cOrig,
-						cOrig.getNoProxyInfo(),
-						cOrig.getProxyInfo(),
-						cOrig.getNonLazyInfo(),
-						cOrig.getNoProxyOwner(),
-						cOrig.getProxyOwner(),
-						cOrig.getNonLazyOwner(),
-						cOrig.getLazyDataPoints().iterator().next(),
-						cOrig.getNonLazyJoinDataPoints().iterator().next(),
-						cOrig.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		Set expectedReadOnlyObjects = new HashSet();
-
-		Session s = openSession();
-		assertFalse( s.isDefaultReadOnly() );
-		Transaction t = s.beginTransaction();
-		s.save( cOrig );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		assertFalse( s.isDefaultReadOnly() );
-		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
-		assertNotSame( cOrig, c );
-		expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		expectedReadOnlyObjects = new HashSet();
-		List list = s.createFilter( c.getLazyDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( true )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( true )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
-				.setMaxResults(1)
-				.setReadOnly( true )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		t.commit();
-		s.close();
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("delete from DataPoint").executeUpdate();
-		s.createQuery("delete from Container").executeUpdate();
-		s.createQuery("delete from Info").executeUpdate();
-		s.createQuery("delete from Owner").executeUpdate();
-		t.commit();
-		s.close();
-	}
-
-	@SuppressWarnings( {"unchecked"})
-	@Test
-	public void testDefaultReadOnlyWithFilterCollectionEntities() {
-		Container cOrig = createContainer();
-		Set expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						cOrig,
-						cOrig.getNoProxyInfo(),
-						cOrig.getProxyInfo(),
-						cOrig.getNonLazyInfo(),
-						cOrig.getNoProxyOwner(),
-						cOrig.getProxyOwner(),
-						cOrig.getNonLazyOwner(),
-						cOrig.getLazyDataPoints().iterator().next(),
-						cOrig.getNonLazyJoinDataPoints().iterator().next(),
-						cOrig.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		Set expectedReadOnlyObjects = new HashSet();
-
-		Session s = openSession();
-		assertFalse( s.isDefaultReadOnly() );
-		Transaction t = s.beginTransaction();
-		s.save( cOrig );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
-		assertNotSame( cOrig, c );
-		expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		expectedReadOnlyObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNoProxyInfo(),
-						c.getProxyInfo(),
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						//c.getLazyDataPoints(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		List list = s.createFilter( c.getLazyDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertTrue( s.isReadOnly( list.get( 0 ) ) );
-		t.commit();
-		s.close();
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("delete from DataPoint").executeUpdate();
-		s.createQuery("delete from Container").executeUpdate();
-		s.createQuery("delete from Info").executeUpdate();
-		s.createQuery("delete from Owner").executeUpdate();
-		t.commit();
-		s.close();
-	}
-
-	@SuppressWarnings( {"unchecked"})
-	@Test
-	public void testDefaultModifiableWithFilterCollectionEntities() {
-		Container cOrig = createContainer();
-		Set expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						cOrig,
-						cOrig.getNoProxyInfo(),
-						cOrig.getProxyInfo(),
-						cOrig.getNonLazyInfo(),
-						cOrig.getNoProxyOwner(),
-						cOrig.getProxyOwner(),
-						cOrig.getNonLazyOwner(),
-						cOrig.getLazyDataPoints().iterator().next(),
-						cOrig.getNonLazyJoinDataPoints().iterator().next(),
-						cOrig.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		Set expectedReadOnlyObjects = new HashSet();
-
-		Session s = openSession();
-		assertFalse( s.isDefaultReadOnly() );
-		Transaction t = s.beginTransaction();
-		s.save( cOrig );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		s.setDefaultReadOnly( true );
-		assertTrue( s.isDefaultReadOnly() );
-		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		assertFalse( s.isDefaultReadOnly() );
-		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
-		assertNotSame( cOrig, c );
-		expectedInitializedObjects = new HashSet(
-				Arrays.asList(
-						c,
-						c.getNonLazyInfo(),
-						c.getNoProxyOwner(),
-						c.getProxyOwner(),
-						c.getNonLazyOwner(),
-						c.getNonLazyJoinDataPoints().iterator().next(),
-						c.getNonLazySelectDataPoints().iterator().next()
-				)
-		);
-		expectedReadOnlyObjects = new HashSet();
-		List list = s.createFilter( c.getLazyDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
-				.setMaxResults( 1 )
-				.list();
-		assertEquals( 1, list.size() );
-		assertFalse( s.isReadOnly( list.get( 0 ) ) );
-		t.commit();
-		s.close();
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("delete from DataPoint").executeUpdate();
-		s.createQuery("delete from Container").executeUpdate();
-		s.createQuery("delete from Info").executeUpdate();
-		s.createQuery("delete from Owner").executeUpdate();
-		t.commit();
-		s.close();
-	}
-
 	private Container createContainer() {
 		Container c = new Container( "container" );
 		c.setNoProxyInfo( new Info( "no-proxy info" ) );
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyFilterTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyFilterTest.java
new file mode 100644
index 0000000000..533534f991
--- /dev/null
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyFilterTest.java
@@ -0,0 +1,427 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.test.readonly;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.hibernate.Hibernate;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.proxy.HibernateProxy;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Andrea Boriero
+ */
+public class ReadOnlySessionLazyNonLazyFilterTest extends AbstractReadOnlyTest {
+	@Override
+	public String[] getMappings() {
+		return new String[] { "readonly/DataPoint.hbm.xml" };
+	}
+
+	@Test
+	@SuppressWarnings( {"unchecked"})
+	public void testDefaultReadOnlyWithModifiableFilterCollectionEntities() {
+		Container cOrig = createContainer();
+		Set expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						cOrig,
+						cOrig.getNoProxyInfo(),
+						cOrig.getProxyInfo(),
+						cOrig.getNonLazyInfo(),
+						cOrig.getNoProxyOwner(),
+						cOrig.getProxyOwner(),
+						cOrig.getNonLazyOwner(),
+						cOrig.getLazyDataPoints().iterator().next(),
+						cOrig.getNonLazyJoinDataPoints().iterator().next(),
+						cOrig.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		Set expectedReadOnlyObjects = new HashSet();
+
+		Session s = openSession();
+		assertFalse( s.isDefaultReadOnly() );
+		Transaction t = s.beginTransaction();
+		s.save( cOrig );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
+		assertNotSame( cOrig, c );
+		expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		expectedReadOnlyObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNoProxyInfo(),
+						c.getProxyInfo(),
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						//c.getLazyDataPoints(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		List list = s.createFilter( c.getLazyDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( false )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( false )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( false )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		t.commit();
+		s.close();
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery("delete from DataPoint").executeUpdate();
+		s.createQuery("delete from Container").executeUpdate();
+		s.createQuery("delete from Info").executeUpdate();
+		s.createQuery("delete from Owner").executeUpdate();
+		t.commit();
+		s.close();
+	}
+
+	@SuppressWarnings( {"unchecked"})
+	@Test
+	public void testDefaultModifiableWithReadOnlyFilterCollectionEntities() {
+		Container cOrig = createContainer();
+		Set expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						cOrig,
+						cOrig.getNoProxyInfo(),
+						cOrig.getProxyInfo(),
+						cOrig.getNonLazyInfo(),
+						cOrig.getNoProxyOwner(),
+						cOrig.getProxyOwner(),
+						cOrig.getNonLazyOwner(),
+						cOrig.getLazyDataPoints().iterator().next(),
+						cOrig.getNonLazyJoinDataPoints().iterator().next(),
+						cOrig.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		Set expectedReadOnlyObjects = new HashSet();
+
+		Session s = openSession();
+		assertFalse( s.isDefaultReadOnly() );
+		Transaction t = s.beginTransaction();
+		s.save( cOrig );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
+		assertFalse( s.isDefaultReadOnly() );
+		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
+		assertNotSame( cOrig, c );
+		expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		expectedReadOnlyObjects = new HashSet();
+		List list = s.createFilter( c.getLazyDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( true )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( true )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
+				.setMaxResults(1)
+				.setReadOnly( true )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		t.commit();
+		s.close();
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery("delete from DataPoint").executeUpdate();
+		s.createQuery("delete from Container").executeUpdate();
+		s.createQuery("delete from Info").executeUpdate();
+		s.createQuery("delete from Owner").executeUpdate();
+		t.commit();
+		s.close();
+	}
+
+	@SuppressWarnings( {"unchecked"})
+	@Test
+	public void testDefaultReadOnlyWithFilterCollectionEntities() {
+		Container cOrig = createContainer();
+		Set expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						cOrig,
+						cOrig.getNoProxyInfo(),
+						cOrig.getProxyInfo(),
+						cOrig.getNonLazyInfo(),
+						cOrig.getNoProxyOwner(),
+						cOrig.getProxyOwner(),
+						cOrig.getNonLazyOwner(),
+						cOrig.getLazyDataPoints().iterator().next(),
+						cOrig.getNonLazyJoinDataPoints().iterator().next(),
+						cOrig.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		Set expectedReadOnlyObjects = new HashSet();
+
+		Session s = openSession();
+		assertFalse( s.isDefaultReadOnly() );
+		Transaction t = s.beginTransaction();
+		s.save( cOrig );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
+		assertNotSame( cOrig, c );
+		expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		expectedReadOnlyObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNoProxyInfo(),
+						c.getProxyInfo(),
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						//c.getLazyDataPoints(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		List list = s.createFilter( c.getLazyDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertTrue( s.isReadOnly( list.get( 0 ) ) );
+		t.commit();
+		s.close();
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery("delete from DataPoint").executeUpdate();
+		s.createQuery("delete from Container").executeUpdate();
+		s.createQuery("delete from Info").executeUpdate();
+		s.createQuery("delete from Owner").executeUpdate();
+		t.commit();
+		s.close();
+	}
+
+	@SuppressWarnings( {"unchecked"})
+	@Test
+	public void testDefaultModifiableWithFilterCollectionEntities() {
+		Container cOrig = createContainer();
+		Set expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						cOrig,
+						cOrig.getNoProxyInfo(),
+						cOrig.getProxyInfo(),
+						cOrig.getNonLazyInfo(),
+						cOrig.getNoProxyOwner(),
+						cOrig.getProxyOwner(),
+						cOrig.getNonLazyOwner(),
+						cOrig.getLazyDataPoints().iterator().next(),
+						cOrig.getNonLazyJoinDataPoints().iterator().next(),
+						cOrig.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		Set expectedReadOnlyObjects = new HashSet();
+
+		Session s = openSession();
+		assertFalse( s.isDefaultReadOnly() );
+		Transaction t = s.beginTransaction();
+		s.save( cOrig );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		s.setDefaultReadOnly( true );
+		assertTrue( s.isDefaultReadOnly() );
+		checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
+		assertFalse( s.isDefaultReadOnly() );
+		Container c = ( Container ) s.get( Container.class, cOrig.getId() );
+		assertNotSame( cOrig, c );
+		expectedInitializedObjects = new HashSet(
+				Arrays.asList(
+						c,
+						c.getNonLazyInfo(),
+						c.getNoProxyOwner(),
+						c.getProxyOwner(),
+						c.getNonLazyOwner(),
+						c.getNonLazyJoinDataPoints().iterator().next(),
+						c.getNonLazySelectDataPoints().iterator().next()
+				)
+		);
+		expectedReadOnlyObjects = new HashSet();
+		List list = s.createFilter( c.getLazyDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazyJoinDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		list = s.createFilter( c.getNonLazySelectDataPoints(), "" )
+				.setMaxResults( 1 )
+				.list();
+		assertEquals( 1, list.size() );
+		assertFalse( s.isReadOnly( list.get( 0 ) ) );
+		t.commit();
+		s.close();
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery("delete from DataPoint").executeUpdate();
+		s.createQuery("delete from Container").executeUpdate();
+		s.createQuery("delete from Info").executeUpdate();
+		s.createQuery("delete from Owner").executeUpdate();
+		t.commit();
+		s.close();
+	}
+
+	private Container createContainer() {
+		Container c = new Container( "container" );
+		c.setNoProxyInfo( new Info( "no-proxy info" ) );
+		c.setProxyInfo( new Info( "proxy info" ) );
+		c.setNonLazyInfo( new Info( "non-lazy info" ) );
+		c.setNoProxyOwner( new Owner( "no-proxy owner" ) );
+		c.setProxyOwner( new Owner( "proxy owner" ) );
+		c.setNonLazyOwner( new Owner( "non-lazy owner" ) );
+		c.getLazyDataPoints().add( new DataPoint( new BigDecimal( 1 ), new BigDecimal( 1 ), "lazy data point" ) );
+		c.getNonLazyJoinDataPoints().add( new DataPoint( new BigDecimal( 2 ), new BigDecimal( 2 ), "non-lazy join data point" ) );
+		c.getNonLazySelectDataPoints().add( new DataPoint( new BigDecimal( 3 ), new BigDecimal( 3 ), "non-lazy select data point" ) );
+		return c;
+	}
+
+	private void checkContainer(Container c, Set expectedInitializedObjects, Set expectedReadOnlyObjects, Session s) {
+		checkObject( c, expectedInitializedObjects, expectedReadOnlyObjects, s );
+		if ( ! expectedInitializedObjects.contains( c ) ) {
+			return;
+		}
+		checkObject( c.getNoProxyInfo(), expectedInitializedObjects, expectedReadOnlyObjects, s);
+		checkObject( c.getProxyInfo(), expectedInitializedObjects, expectedReadOnlyObjects, s);
+		checkObject( c.getNonLazyInfo(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		checkObject( c.getNoProxyOwner(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		checkObject( c.getProxyOwner(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		checkObject( c.getNonLazyOwner(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		if ( Hibernate.isInitialized( c.getLazyDataPoints() ) ) {
+			for ( Iterator it=c.getLazyDataPoints().iterator(); it.hasNext(); ) {
+				checkObject( it.next(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+			}
+		}
+		for ( Iterator it=c.getNonLazyJoinDataPoints().iterator(); it.hasNext(); ) {
+			checkObject( it.next(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		}
+		for ( Iterator it=c.getNonLazySelectDataPoints().iterator(); it.hasNext(); ) {
+			checkObject( it.next(), expectedInitializedObjects, expectedReadOnlyObjects, s );
+		}
+	}
+
+	private void checkObject(Object entityOrProxy, Set expectedInitializedObjects, Set expectedReadOnlyObjects, Session s) {
+		boolean isExpectedToBeInitialized = expectedInitializedObjects.contains( entityOrProxy );
+		boolean isExpectedToBeReadOnly = expectedReadOnlyObjects.contains( entityOrProxy );
+		SessionImplementor si = (SessionImplementor) s;
+		assertEquals( isExpectedToBeInitialized, Hibernate.isInitialized( entityOrProxy ) );
+		assertEquals( isExpectedToBeReadOnly, s.isReadOnly( entityOrProxy ) );
+		if ( Hibernate.isInitialized( entityOrProxy ) ) {
+			Object entity = ( entityOrProxy instanceof HibernateProxy ?
+					( ( HibernateProxy ) entityOrProxy ).getHibernateLazyInitializer().getImplementation( si ) :
+					entityOrProxy
+			);
+			assertNotNull( entity );
+			assertEquals( isExpectedToBeReadOnly, s.isReadOnly( entity ));
+		}
+	}
+
+}