diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 0e30ded30..76d3c0785 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -24,7 +24,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
   @AfterClass
   public static void reportStats() {
-    BasicMetricVisitor basic = Ebean.getDefaultServer().getMetaInfoManager().visitBasic();
+    BasicMetricVisitor basic = DB.getDefault().getMetaInfoManager().visitBasic();
     for (MetaQueryMetric metric : basic.getDtoQueryMetrics()) {
       System.out.println(metric);
     }
diff --git a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
index 1489f1c52..e7b8577cb 100644
--- a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
+++ b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
@@ -27,7 +27,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlRow sqlRow = DB.createSqlQuery("select * from e_basic where id = :id")
+    SqlRow sqlRow = DB.sqlQuery("select * from e_basic where id = :id")
       .setParameter("id", b.getId())
       .findOne();
 
@@ -54,7 +54,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlQuery q = DB.createSqlQuery("select * from e_basic_enum_id where status = :status");
+    SqlQuery q = DB.sqlQuery("select * from e_basic_enum_id where status = :status");
     q.setParameter("status", b.getStatus());
 
     SqlRow sqlRow = q.findOne();
@@ -80,7 +80,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlQuery q = DB.createSqlQuery("select * from e_basic_eni where id = :id");
+    SqlQuery q = DB.sqlQuery("select * from e_basic_eni where id = :id");
     q.setParameter("id", b.getId());
 
     Optional<SqlRow> sqlRow = q.findOneOrEmpty();