diff --git a/pom.xml b/pom.xml
index 69d1d7ae5..9e486ceed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,31 +163,11 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-integration</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>    
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.0.9</version>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>avaje-composite-testing</artifactId>
+      <version>1.1</version>
       <scope>test</scope>
+      <type>pom</type>
     </dependency>
 
     <dependency>
diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
index b93f49bc7..e1603cdde 100644
--- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
+++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
@@ -1,15 +1,16 @@
 package com.avaje.tests.batchload;
 
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.Ebean;
 import com.avaje.ebean.FetchConfig;
 import com.avaje.tests.model.basic.Order;
 import com.avaje.tests.model.basic.ResetBasicData;
+import org.avaje.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryJoinToAssocOne extends BaseTestCase {
 
@@ -18,17 +19,19 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    // This will use 3 SQL queries to build this object graph
-    List<Order> l0 = Ebean.find(Order.class).select("status, shipDate")
+    LoggedSqlCollector.start();
+
+    // This will use 2 SQL queries to build this object graph
+    List<Order> l0 = Ebean.find(Order.class)
+        .select("status, shipDate")
         .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
         .fetch("details.product", "sku, name")
-
-        // .join("customer", "name", new JoinConfig().query(10))
-        // .join("customer.contacts","firstName, lastName, mobile")
-        // .join("customer.shippingAddress","line1, city")
         .findList();
 
-    Assert.assertTrue(l0.size() > 0);
+    assertThat(l0).isNotEmpty();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(2);
 
   }
 }
diff --git a/src/test/java/com/avaje/tests/lifecycle/TestLifecyleAnnotatedBean.java b/src/test/java/com/avaje/tests/lifecycle/TestLifecyleAnnotatedBean.java
index 90aec657b..ff3f42cd2 100644
--- a/src/test/java/com/avaje/tests/lifecycle/TestLifecyleAnnotatedBean.java
+++ b/src/test/java/com/avaje/tests/lifecycle/TestLifecyleAnnotatedBean.java
@@ -1,12 +1,11 @@
 package com.avaje.tests.lifecycle;
 
-import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.basic.EBasicWithLifecycle;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestLifecyleAnnotatedBean extends BaseTestCase {
 
@@ -18,8 +17,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     Ebean.getServerCacheManager();
     Ebean.save(bean);
     
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("prePersist1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("prePersist2"));
+    assertThat(bean.getBuffer()).contains("prePersist1");
+    assertThat(bean.getBuffer()).contains("prePersist2");
   }
 
   @Test
@@ -30,8 +29,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     Ebean.getServerCacheManager();
     Ebean.save(bean);
 
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postPersist1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postPersist2"));
+    assertThat(bean.getBuffer()).contains("postPersist1");
+    assertThat(bean.getBuffer()).contains("postPersist2");
   }
 
   @Test
@@ -43,8 +42,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     Ebean.save(bean);
 
     EBasicWithLifecycle loaded = Ebean.find(EBasicWithLifecycle.class, bean.getId());
-    Assert.assertThat(loaded.getBuffer(), Matchers.containsString("postLoad1"));
-    Assert.assertThat(loaded.getBuffer(), Matchers.containsString("postLoad2"));
+    assertThat(loaded.getBuffer()).contains("postLoad1");
+    assertThat(loaded.getBuffer()).contains("postLoad2");
   }
 
   @Test
@@ -58,8 +57,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     bean.setName("PreUpdate");
     Ebean.save(bean);
 
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("preUpdate1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("preUpdate2"));
+    assertThat(bean.getBuffer()).contains("preUpdate1");
+    assertThat(bean.getBuffer()).contains("preUpdate2");
   }
 
   @Test
@@ -73,8 +72,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     bean.setName("PostUpdate");
     Ebean.save(bean);
 
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postUpdate1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postUpdate2"));
+    assertThat(bean.getBuffer()).contains("postUpdate1");
+    assertThat(bean.getBuffer()).contains("postUpdate2");
   }
 
   @Test
@@ -86,8 +85,8 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     Ebean.save(bean);
     Ebean.delete(bean);
 
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("preRemove1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("preRemove2"));
+    assertThat(bean.getBuffer()).contains("preRemove1");
+    assertThat(bean.getBuffer()).contains("preRemove2");
   }
 
   @Test
@@ -99,7 +98,7 @@ public class TestLifecyleAnnotatedBean extends BaseTestCase {
     Ebean.save(bean);
     Ebean.delete(bean);
 
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postRemove1"));
-    Assert.assertThat(bean.getBuffer(), Matchers.containsString("postRemove2"));
+    assertThat(bean.getBuffer()).contains("postRemove1");
+    assertThat(bean.getBuffer()).contains("postRemove2");
   }
 }
diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
index 059eaf089..83fd961a5 100644
--- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
+++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
@@ -1,8 +1,7 @@
 package com.avaje.tests.persistencecontext;
 
 import org.junit.Test;
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.MatcherAssert.*;
+import static org.assertj.core.api.Assertions.*;
 
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.Ebean;
@@ -33,7 +32,7 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase {
       // actually the bean is not in the persistence context so ...  the assert is fine
       EBasic loadedEntity = server.find(EBasic.class,bean1.getId());
 
-      assertThat(loadedEntity.getName(), is("hello-changed")); 
+      assertThat(loadedEntity.getName()).isEqualTo("hello-changed");
 
     } finally {
       server.endTransaction();