diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
index 120d7aaea..6034e16ab 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
@@ -115,12 +115,12 @@ public class TestQueryExists extends BaseTestCase {
   public void testExistsNoWhere() {
     ResetBasicData.reset();
 
-    Query<Order> subQuery = Ebean.find(Order.class).alias("sq").select("id");
-    Query<Customer> query = Ebean.find(Customer.class).alias("qt").where().notExists(subQuery).query();
+    Query<Order> subQuery = DB.find(Order.class).alias("sq").select("id");
+    Query<Customer> query = DB.find(Customer.class).alias("qt").where().notExists(subQuery).query();
 
     query.findList();
     String sql = query.getGeneratedSql();
 
-    assertThat(sql).contains("not exists (select sq.id from o_order sq)");
+    assertThat(sql).contains("not exists (select 1 from o_order sq)");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index 9accb22c4..0eb99f326 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -4,13 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.Test;
-import org.tests.model.basic.CKeyParent;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.OrderDetail;
-import org.tests.model.basic.OrderShipment;
-import org.tests.model.basic.ResetBasicData;
-import org.tests.model.basic.Vehicle;
-import org.tests.model.basic.VehicleDriver;
+import org.tests.model.basic.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -127,7 +121,7 @@ public class TestSubQuery extends BaseTestCase {
     assertThat(query.getGeneratedSql())
         .isEqualTo("select t0.ship_time from or_order_ship t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
   }
-  
+
   public void testCompositeKey() {
     ResetBasicData.reset();