diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java
index a3dc99d59..84668d892 100644
--- a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java
+++ b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java
@@ -18,9 +18,9 @@ public class TestM2MVanilla extends BaseTestCase {
   @Test
   public void testVanilla() {
 
-    SqlUpdate delInt = Ebean.createSqlUpdate("delete from mrole_muser");
-    SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mrole");
-    SqlUpdate delUsers = Ebean.createSqlUpdate("delete from muser");
+    SqlUpdate delInt = Ebean.createSqlUpdate("delete from mys.mrole_muser");
+    SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mys.mrole");
+    SqlUpdate delUsers = Ebean.createSqlUpdate("delete from mys.muser");
     
     Ebean.execute(delInt);
     Ebean.execute(delRoles);
diff --git a/src/test/java/com/avaje/tests/model/basic/MRole.java b/src/test/java/com/avaje/tests/model/basic/MRole.java
index 263e38f0d..7e4221b64 100644
--- a/src/test/java/com/avaje/tests/model/basic/MRole.java
+++ b/src/test/java/com/avaje/tests/model/basic/MRole.java
@@ -1,95 +1,88 @@
 package com.avaje.tests.model.basic;
 
-import java.util.List;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import java.util.List;
 
 @Entity
+@Table(name = "mrole", schema = "mys")
 public class MRole {
 
-	@Id
-	Integer roleid;
-	
-	String roleName;
+  @Id
+  Integer roleid;
 
-	@ManyToMany(cascade=CascadeType.ALL
-//	@JoinTable(name="myint_table"//, 
-//		joinColumns={
-//			@JoinColumn(name="mroleid", referencedColumnName="roleid")
-//		}//,
-//		inverseJoinColumns={
-//			@JoinColumn(name = "muserid", referencedColumnName="userid")
-//		}
-	
-	)
-	List<MUser> users;
-	
-    public MRole() {
-        
+  String roleName;
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  List<MUser> users;
+
+  public MRole() {
+
+  }
+
+  public MRole(String roleName) {
+    this.roleName = roleName;
+  }
+
+  public Integer getRoleid() {
+    return roleid;
+  }
+
+  public void setRoleid(Integer roleid) {
+    this.roleid = roleid;
+  }
+
+  public String getRoleName() {
+    return roleName;
+  }
+
+  public void setRoleName(String roleName) {
+    this.roleName = roleName;
+  }
+
+  public List<MUser> getUsers() {
+    return users;
+  }
+
+  public void setUsers(List<MUser> users) {
+    this.users = users;
+  }
+
+  @Override
+  public String toString() {
+    return "MRole [roleName=" + roleName + "]";
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
     }
-    
-    public MRole(String roleName) {
-        this.roleName = roleName;
+
+    // Make sure other is not null and has the same class as this
+    if (other != null && getClass().equals(other.getClass())) {
+      final MRole rhs = (MRole) other;
+      if (roleid.equals(rhs.roleid)) {
+        if (roleid == 0) {
+          return false;
+        } else {
+          return true;
+        }
+      }
     }
-    
-	public Integer getRoleid() {
-		return roleid;
-	}
+    return false;
+  }
 
-	public void setRoleid(Integer roleid) {
-		this.roleid = roleid;
-	}
+  @Override
+  public int hashCode() {
+    if (roleid != null && roleid != 0) {
+      int rid = roleid;
+      return (int) (rid ^ (rid >>> 32));
+    }
+    return super.hashCode();
+  }
 
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public List<MUser> getUsers() {
-		return users;
-	}
-
-	public void setUsers(List<MUser> users) {
-		this.users = users;
-	}
-
-	@Override
-	public String toString() {
-		return "MRole [roleName=" + roleName + "]";
-	}
-	@Override
-	public boolean equals(Object other) {
-		if (this == other){
-			return true;
-		}
-
-		// Make sure other is not null and has the same class as this
-		if (other != null && getClass().equals(other.getClass())){
-			final MRole rhs = (MRole)other; 
-			if ( roleid.equals(rhs.roleid)){
-				if (roleid == 0){
-					return false;
-				}else{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		if (roleid != null && roleid != 0){
-			int rid = roleid;
-			return (int)( rid ^ (rid >>> 32) );
-		}
-		return super.hashCode();
-	}
-	
 }
diff --git a/src/test/java/com/avaje/tests/model/basic/MUser.java b/src/test/java/com/avaje/tests/model/basic/MUser.java
index 9fee1f570..84ae11509 100644
--- a/src/test/java/com/avaje/tests/model/basic/MUser.java
+++ b/src/test/java/com/avaje/tests/model/basic/MUser.java
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.persistence.*;
 
 @Entity
+@Table(name="muser", schema = "mys")
 public class MUser {
 
 	@Id
diff --git a/src/test/java/com/avaje/tests/model/basic/MUserType.java b/src/test/java/com/avaje/tests/model/basic/MUserType.java
index 6b499631a..049dc2d79 100644
--- a/src/test/java/com/avaje/tests/model/basic/MUserType.java
+++ b/src/test/java/com/avaje/tests/model/basic/MUserType.java
@@ -2,8 +2,10 @@ package com.avaje.tests.model.basic;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
+@Table(name="muser_type", schema = "mys")
 public class MUserType {
 
 	@Id
diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java
index e2c78c586..7cfc54438 100644
--- a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java
+++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java
@@ -56,8 +56,8 @@ public class TestManyWhereJoinM2M extends BaseTestCase {
 
     String sql = query.getGeneratedSql();
     Assert.assertTrue(sql.contains("select distinct"));
-    Assert.assertTrue(sql.contains("left outer join mrole "));
-    Assert.assertTrue(sql.contains("join mrole "));
+    Assert.assertTrue(sql.contains("left outer join mys.mrole "));
+    Assert.assertTrue(sql.contains("join mys.mrole "));
     Assert.assertTrue(sql.contains(".role_name = ?"));
 
   }
diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java
index 0496a10fc..3d0b21d79 100644
--- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java
+++ b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java
@@ -57,7 +57,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
       String sql = query.getGeneratedSql();
       Assert.assertTrue(sql.contains("select distinct"));
-      Assert.assertTrue(sql.contains("outer join mrole "));
+      Assert.assertTrue(sql.contains("outer join mys.mrole "));
       Assert.assertTrue(sql.contains(".role_name = ?"));
 
     } finally {
diff --git a/src/test/resources/test-ebean.properties b/src/test/resources/test-ebean.properties
index 2329a96dc..8485bf363 100644
--- a/src/test/resources/test-ebean.properties
+++ b/src/test/resources/test-ebean.properties
@@ -1 +1,3 @@
-datasource.h2.username=sa
\ No newline at end of file
+datasource.h2.username=sa
+
+ebean.ddl.initSql=init.sql
\ No newline at end of file