diff --git a/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
index a8c87024d..ab7dbd763 100644
--- a/src/test/java/org/tests/basic/event/TestQueryAdapter.java
+++ b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
@@ -3,10 +3,11 @@ package org.tests.basic.event;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.TOne;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryAdapter extends BaseTestCase {
 
@@ -20,16 +21,11 @@ public class TestQueryAdapter extends BaseTestCase {
 
     Ebean.save(o);
 
-    //Ebean.find(TOne.class, o.getId());
-
-    Query<TOne> queryFindId = Ebean.find(TOne.class)
-      .setId(o.getId());
+    Query<TOne> queryFindId = Ebean.find(TOne.class).setId(o.getId());
 
     TOne one = queryFindId.findOne();
-    Assert.assertNotNull(one);
-    Assert.assertEquals(one.getId(), o.getId());
-    String generatedSql = queryFindId.getGeneratedSql();
-    Assert.assertTrue(generatedSql.contains(" 1=1"));
 
+    assertThat(one.getId()).isEqualTo(o.getId());
+    assertThat(sqlOf(queryFindId)).contains(" 1=1");
   }
 }