diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java
index 84668d892..a3dc99d59 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 mys.mrole_muser");
-    SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mys.mrole");
-    SqlUpdate delUsers = Ebean.createSqlUpdate("delete from mys.muser");
+    SqlUpdate delInt = Ebean.createSqlUpdate("delete from mrole_muser");
+    SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mrole");
+    SqlUpdate delUsers = Ebean.createSqlUpdate("delete from 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 7e4221b64..5ae7ef2f2 100644
--- a/src/test/java/com/avaje/tests/model/basic/MRole.java
+++ b/src/test/java/com/avaje/tests/model/basic/MRole.java
@@ -8,7 +8,7 @@ import javax.persistence.Table;
 import java.util.List;
 
 @Entity
-@Table(name = "mrole", schema = "mys")
+@Table(name = "mrole")
 public class MRole {
 
   @Id
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 84ae11509..5c6746de8 100644
--- a/src/test/java/com/avaje/tests/model/basic/MUser.java
+++ b/src/test/java/com/avaje/tests/model/basic/MUser.java
@@ -6,7 +6,7 @@ import java.util.List;
 import javax.persistence.*;
 
 @Entity
-@Table(name="muser", schema = "mys")
+@Table(name="muser")
 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 049dc2d79..2e73f1a0d 100644
--- a/src/test/java/com/avaje/tests/model/basic/MUserType.java
+++ b/src/test/java/com/avaje/tests/model/basic/MUserType.java
@@ -5,7 +5,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="muser_type", schema = "mys")
+@Table(name="muser_type")
 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 7cfc54438..e2c78c586 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 mys.mrole "));
-    Assert.assertTrue(sql.contains("join mys.mrole "));
+    Assert.assertTrue(sql.contains("left outer join mrole "));
+    Assert.assertTrue(sql.contains("join 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 3d0b21d79..0496a10fc 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 mys.mrole "));
+      Assert.assertTrue(sql.contains("outer join 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 8485bf363..ed085d404 100644
--- a/src/test/resources/test-ebean.properties
+++ b/src/test/resources/test-ebean.properties
@@ -1,3 +1 @@
 datasource.h2.username=sa
-
-ebean.ddl.initSql=init.sql
\ No newline at end of file