diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java b/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java
index 13cd10a8a..bc41111b5 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java
+++ b/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java
@@ -10,8 +10,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.EntityPath;
-
 public class AliasTest {
 
     @Test
@@ -37,36 +35,6 @@ public class AliasTest {
         assertEquals("domainType.gender", $(domainType.getGender()).toString());
     }
     
-    @Test
-    public void CollectionUsage(){
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals("any(domainType.collection) = domainType", $(domainType.getCollection()).any().eq(domainType).toString());
-        assertEquals("any(domainType.set) = domainType", $(domainType.getSet()).any().eq(domainType).toString());
-        assertEquals("any(domainType.list) = domainType", $(domainType.getList()).any().eq(domainType).toString());
-        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList().get(0)).eq(domainType).toString());
-        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList()).get(0).eq(domainType).toString());
-        assertEquals("domainType.map.get(key) = domainType", $(domainType.getMap()).get("key").eq(domainType).toString());
-        
-        EntityPath<DomainType> domainTypePath = $(domainType);
-        assertEquals("domainType in domainType.collection", $(domainType.getCollection()).contains(domainTypePath).toString());
-    }
-    
-    @Test
-    public void CollectionUsage_Types(){
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals(DomainType.class, $(domainType.getCollection()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getSet()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getList()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getMap()).get("key").getType());
-    }
-    
-    @Test
-    public void ScalaAccessors(){
-        ScalaAccessors scalaAccessors = Alias.alias(ScalaAccessors.class);
-        assertEquals("scalaAccessors.firstName", $(scalaAccessors.firstName()).toString());
-        assertEquals("scalaAccessors.lastName",  $(scalaAccessors.lastName()).toString());
-    }
-
     @Test
     public void GetAny(){
         DomainType domainType = Alias.alias(DomainType.class);
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java b/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java
new file mode 100644
index 000000000..82f4ab952
--- /dev/null
+++ b/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java
@@ -0,0 +1,36 @@
+package com.mysema.query.alias;
+
+import static com.mysema.query.alias.Alias.$;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.mysema.query.types.EntityPath;
+
+public class CollectionTest {
+    
+    @Test
+    public void CollectionUsage(){
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals("any(domainType.collection) = domainType", $(domainType.getCollection()).any().eq(domainType).toString());
+        assertEquals("any(domainType.set) = domainType", $(domainType.getSet()).any().eq(domainType).toString());
+        assertEquals("any(domainType.list) = domainType", $(domainType.getList()).any().eq(domainType).toString());
+        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList().get(0)).eq(domainType).toString());
+        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList()).get(0).eq(domainType).toString());
+        assertEquals("domainType.map.get(key) = domainType", $(domainType.getMap()).get("key").eq(domainType).toString());
+        
+        EntityPath<DomainType> domainTypePath = $(domainType);
+        assertEquals("domainType in domainType.collection", $(domainType.getCollection()).contains(domainTypePath).toString());
+    }
+    
+    @Test
+    public void CollectionUsage_Types(){
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals(DomainType.class, $(domainType.getCollection()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getSet()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getList()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getMap()).get("key").getType());
+    }
+    
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java b/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java
new file mode 100644
index 000000000..645a40349
--- /dev/null
+++ b/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java
@@ -0,0 +1,17 @@
+package com.mysema.query.alias;
+
+import static com.mysema.query.alias.Alias.$;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class ScalaAccessorsTest {
+    
+    @Test
+    public void ScalaAccessors(){
+        ScalaAccessors scalaAccessors = Alias.alias(ScalaAccessors.class);
+        assertEquals("scalaAccessors.firstName", $(scalaAccessors.firstName()).toString());
+        assertEquals("scalaAccessors.lastName",  $(scalaAccessors.lastName()).toString());
+    }
+
+}