diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
index d996938fc..cc74d7478 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -98,11 +98,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   protected void loadLargeAllocation(final int allocateSize) {
     // preAllocateIds was called with a relatively large batchSize
     // so we will just go ahead and load those anyway in background
-    backgroundExecutor.execute(new Runnable() {
-      public void run() {
-        loadMoreIds(allocateSize, null);
-      }
-    });
+    backgroundExecutor.execute(() -> loadMoreIds(allocateSize, null));
   }
 
   /**
@@ -145,12 +141,10 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
       currentlyBackgroundLoading = batchSize;
 
-      backgroundExecutor.execute(new Runnable() {
-        public void run() {
-          loadMoreIds(batchSize, null);
-          synchronized (backgroundLoadMonitor) {
-            currentlyBackgroundLoading = 0;
-          }
+      backgroundExecutor.execute(() -> {
+        loadMoreIds(batchSize, null);
+        synchronized (backgroundLoadMonitor) {
+          currentlyBackgroundLoading = 0;
         }
       });
     }
diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
index 3237ce697..17b27e751 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java
@@ -42,12 +42,7 @@ public class MigrationModel {
   private void readMigrations() {
 
     // find all the migration xml files
-    File[] xmlFiles = modelDirectory.listFiles(new FileFilter() {
-      @Override
-      public boolean accept(File pathname) {
-        return pathname.getName().toLowerCase().endsWith(modelSuffix);
-      }
-    });
+    File[] xmlFiles = modelDirectory.listFiles(pathname -> pathname.getName().toLowerCase().endsWith(modelSuffix));
 
     List<MigrationResource> resources = new ArrayList<>();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
index 6843bc098..b47881684 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -974,12 +974,9 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
       prop.docStoreMapping(mapping, prefix);
     }
     if (inheritInfo != null) {
-      inheritInfo.visitChildren(new InheritInfoVisitor() {
-        @Override
-        public void visit(InheritInfo inheritInfo) {
-          for (BeanProperty localProperty : inheritInfo.localProperties()) {
-            localProperty.docStoreMapping(mapping, prefix);
-          }
+      inheritInfo.visitChildren(inheritInfo1 -> {
+        for (BeanProperty localProperty : inheritInfo1.localProperties()) {
+          localProperty.docStoreMapping(mapping, prefix);
         }
       });
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
index 3821f2ba0..a5586d87f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
@@ -94,15 +94,12 @@ public class InheritInfo {
    */
   public void appendCheckConstraintValues(final String propertyName, final Set<String> checkConstraintValues) {
 
-    visitChildren(new InheritInfoVisitor() {
-      @Override
-      public void visit(InheritInfo inheritInfo) {
-        BeanProperty prop = inheritInfo.desc().getBeanProperty(propertyName);
-        if (prop != null) {
-          Set<String> values = prop.getDbCheckConstraintValues();
-          if (values != null) {
-            checkConstraintValues.addAll(values);
-          }
+    visitChildren(inheritInfo -> {
+      BeanProperty prop = inheritInfo.desc().getBeanProperty(propertyName);
+      if (prop != null) {
+        Set<String> values = prop.getDbCheckConstraintValues();
+        if (values != null) {
+          checkConstraintValues.addAll(values);
         }
       }
     });
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java
index f47dcb04e..cc4b2c0e6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -152,13 +152,11 @@ public final class PostCommitProcessing {
    * In background notify persist listeners, cluster and document store.
    */
   Runnable backgroundNotify() {
-    return new Runnable() {
-      public void run() {
-        processCacheChanges(cacheChanges);
-        localPersistListenersNotify();
-        notifyCluster();
-        processDocStoreUpdates();
-      }
+    return () -> {
+      processCacheChanges(cacheChanges);
+      localPersistListenersNotify();
+      notifyCluster();
+      processDocStoreUpdates();
     };
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java
index 4d42916e4..68e477df7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java
@@ -422,12 +422,7 @@ public class TransactionManager {
     if (changeLogPrepare.prepare(changeSet)) {
 
       // call the log method in background
-      backgroundExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          changeLogListener.log(changeSet);
-        }
-      });
+      backgroundExecutor.execute(() -> changeLogListener.log(changeSet));
     }
   }
 
diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
index 3b17dc39b..942094df6 100644
--- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
+++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
@@ -262,12 +262,9 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
 
     InheritInfo inheritInfo = desc.getInheritInfo();
     if (inheritInfo != null) {
-      inheritInfo.visitChildren(new InheritInfoVisitor() {
-        @Override
-        public void visit(InheritInfo inheritInfo) {
-          for (BeanProperty localProperty : inheritInfo.localProperties()) {
-            localProperty.docStoreInclude(includeByDefault, docStructure);
-          }
+      inheritInfo.visitChildren(inheritInfo1 -> {
+        for (BeanProperty localProperty : inheritInfo1.localProperties()) {
+          localProperty.docStoreInclude(includeByDefault, docStructure);
         }
       });
     }
diff --git a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java
index 09e6a61a4..480c6d4f2 100644
--- a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java
+++ b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java
@@ -37,17 +37,15 @@ public class TestDuplcateKeyException extends BaseTestCase {
 		holder.add(listAttribute);
 		
 		try {
-			Ebean.execute(new TxRunnable() {
-				public void run() {
-				    //Ebean.currentTransaction().log("-- saving holder first time");
-				    // Alternatively turn off cascade Persist for this transaction
-				    //Ebean.currentTransaction().setPersistCascade(false);
-					Ebean.save(holder);
-          //Ebean.currentTransaction().log("-- saving holder second time");
-					// we don't get this far before failing
-					//Ebean.save(holder);
-				}
-			});
+			Ebean.execute(() -> {
+                //Ebean.currentTransaction().log("-- saving holder first time");
+                // Alternatively turn off cascade Persist for this transaction
+                //Ebean.currentTransaction().setPersistCascade(false);
+                Ebean.save(holder);
+//Ebean.currentTransaction().log("-- saving holder second time");
+                // we don't get this far before failing
+                //Ebean.save(holder);
+            });
 		} catch (Exception e){
 			Assert.assertEquals(e.getMessage(), "test rollback");
 		}
diff --git a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java
index 4280fe31a..5d441ee0a 100644
--- a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java
+++ b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java
@@ -23,49 +23,45 @@ public class ResetBasicData {
 
     final ResetBasicData me = new ResetBasicData();
 
-    server.execute(new TxRunnable() {
-      public void run() {
-        if (server.find(Product.class).findCount() > 0) {
-          // we can't really delete this base data as
-          // the test rely on the products being in there
-          return;
-        }
-        //me.deleteAll();
-        me.insertCountries();
-        me.insertProducts();
-        me.insertTestCustAndOrders();
+    server.execute(() -> {
+      if (server.find(Product.class).findCount() > 0) {
+        // we can't really delete this base data as
+        // the test rely on the products being in there
+        return;
       }
+      //me.deleteAll();
+      me.insertCountries();
+      me.insertProducts();
+      me.insertTestCustAndOrders();
     });
     runOnce = true;
   }
 
 
   public void deleteAll() {
-    Ebean.execute(new TxRunnable() {
-      public void run() {
+    Ebean.execute(() -> {
 
-        // orm update use bean name and bean properties
-        server.createSqlUpdate("delete from o_cached_bean_child").execute();
-        server.createSqlUpdate("delete from o_cached_bean_country").execute();
-        server.createSqlUpdate("delete from o_cached_bean").execute();
+      // orm update use bean name and bean properties
+      server.createSqlUpdate("delete from o_cached_bean_child").execute();
+      server.createSqlUpdate("delete from o_cached_bean_country").execute();
+      server.createSqlUpdate("delete from o_cached_bean").execute();
 
-        server.createUpdate(OrderShipment.class, "delete from orderShipment").execute();
+      server.createUpdate(OrderShipment.class, "delete from orderShipment").execute();
 
-        server.createUpdate(OrderDetail.class, "delete from orderDetail").execute();
+      server.createUpdate(OrderDetail.class, "delete from orderDetail").execute();
 
-        server.createUpdate(Order.class, "delete from order").execute();
+      server.createUpdate(Order.class, "delete from order").execute();
 
-        server.createUpdate(Contact.class, "delete from contact").execute();
+      server.createUpdate(Contact.class, "delete from contact").execute();
 
-        server.createUpdate(Customer.class, "delete from Customer").execute();
+      server.createUpdate(Customer.class, "delete from Customer").execute();
 
-        server.createUpdate(Address.class, "delete from address").execute();
+      server.createUpdate(Address.class, "delete from address").execute();
 
-        // sql update uses table and column names
-        server.createSqlUpdate("delete from o_country").execute();
-        server.createSqlUpdate("delete from o_product").execute();
+      // sql update uses table and column names
+      server.createSqlUpdate("delete from o_country").execute();
+      server.createSqlUpdate("delete from o_product").execute();
 
-      }
     });
   }
 
@@ -76,18 +72,16 @@ public class ResetBasicData {
       return;
     }
 
-    server.execute(new TxRunnable() {
-      public void run() {
-        Country c = new Country();
-        c.setCode("NZ");
-        c.setName("New Zealand");
-        server.save(c);
+    server.execute(() -> {
+      Country c = new Country();
+      c.setCode("NZ");
+      c.setName("New Zealand");
+      server.save(c);
 
-        Country au = new Country();
-        au.setCode("AU");
-        au.setName("Australia");
-        server.save(au);
-      }
+      Country au = new Country();
+      au.setCode("AU");
+      au.setName("Australia");
+      server.save(au);
     });
   }
 
@@ -97,46 +91,42 @@ public class ResetBasicData {
     if (server.find(Product.class).findCount() > 0) {
       return;
     }
-    server.execute(new TxRunnable() {
-      public void run() {
-        Product p = new Product();
-        p.setName("Chair");
-        p.setSku("C001");
-        server.save(p);
+    server.execute(() -> {
+      Product p = new Product();
+      p.setName("Chair");
+      p.setSku("C001");
+      server.save(p);
 
-        p = new Product();
-        p.setName("Desk");
-        p.setSku("DSK1");
-        server.save(p);
+      p = new Product();
+      p.setName("Desk");
+      p.setSku("DSK1");
+      server.save(p);
 
-        p = new Product();
-        p.setName("Computer");
-        p.setSku("C002");
-        server.save(p);
+      p = new Product();
+      p.setName("Computer");
+      p.setSku("C002");
+      server.save(p);
 
-        p = new Product();
-        p.setName("Printer");
-        p.setSku("C003");
-        server.save(p);
-      }
+      p = new Product();
+      p.setName("Printer");
+      p.setSku("C003");
+      server.save(p);
     });
   }
 
   public void insertTestCustAndOrders() {
 
-    Ebean.execute(new TxRunnable() {
-      public void run() {
-        Customer cust1 = insertCustomer("Rob");
-        Customer cust2 = insertCustomerNoAddress();
-        insertCustomerFiona();
-        insertCustomerNoContacts("NocCust");
+    Ebean.execute(() -> {
+      Customer cust1 = insertCustomer("Rob");
+      Customer cust2 = insertCustomerNoAddress();
+      insertCustomerFiona();
+      insertCustomerNoContacts("NocCust");
 
-        createOrder1(cust1);
-        createOrder2(cust2);
-        createOrder3(cust1);
-        createOrder4(cust1);
-        createOrder5(cust2);
-      }
+      createOrder1(cust1);
+      createOrder2(cust2);
+      createOrder3(cust1);
+      createOrder4(cust1);
+      createOrder5(cust2);
     });
   }
 
diff --git a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java
index 4c928bbf7..9da8647eb 100644
--- a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java
+++ b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java
@@ -15,26 +15,24 @@ public class TestTextJsonSelfRef extends BaseTestCase {
   @Test
   public void test() {
 
-    Ebean.execute(new TxRunnable() {
-      public void run() {
+    Ebean.execute(() -> {
 
-        if (Ebean.find(SelfRefCustomer.class).findCount() == 0) {
-          SelfRefCustomer c1 = new SelfRefCustomer();
-          c1.setName("Foo");
-          c1.setReferredBy(c1);
+      if (Ebean.find(SelfRefCustomer.class).findCount() == 0) {
+        SelfRefCustomer c1 = new SelfRefCustomer();
+        c1.setName("Foo");
+        c1.setReferredBy(c1);
 
-          SelfRefCustomer c2 = new SelfRefCustomer();
-          c2.setName("Bar");
-          c2.setReferredBy(c1);
+        SelfRefCustomer c2 = new SelfRefCustomer();
+        c2.setName("Bar");
+        c2.setReferredBy(c1);
 
-          SelfRefCustomer c3 = new SelfRefCustomer();
-          c3.setName("baz");
-          c3.setReferredBy(c1);
+        SelfRefCustomer c3 = new SelfRefCustomer();
+        c3.setName("baz");
+        c3.setReferredBy(c1);
 
-          Ebean.save(c1);
-          Ebean.save(c2);
-          Ebean.save(c3);
-        }
+        Ebean.save(c1);
+        Ebean.save(c2);
+        Ebean.save(c3);
       }
     });
 
diff --git a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java
index f639ee2da..59858862e 100644
--- a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java
+++ b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java
@@ -28,14 +28,11 @@ public class TestOneToManyCorrectGrouping extends BaseTestCase {
 
     final AtomicInteger count = new AtomicInteger();
 
-    customerQuery.findEach(new QueryEachConsumer<Customer>() {
-      @Override
-      public void accept(Customer customer) {
-        for (Order order : customer.getOrders()) {
-          order.getId();
-        }
-        count.incrementAndGet();
+    customerQuery.findEach(customer -> {
+      for (Order order : customer.getOrders()) {
+        order.getId();
       }
+      count.incrementAndGet();
     });
     assertEquals(EXPECTED_ITERATIONS, count.get());
   }
diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java
index 08ed70f21..1db5af130 100644
--- a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java
+++ b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java
@@ -25,12 +25,9 @@ public class TestQueryFindEach extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-
-      public void accept(Customer customer) {
-        counter.incrementAndGet();
-        customer.getName();
-      }
+    query.findEach(customer -> {
+      counter.incrementAndGet();
+      customer.getName();
     });
 
     Assert.assertEquals(2, counter.get());
@@ -52,13 +49,10 @@ public class TestQueryFindEach extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-
-      public void accept(Customer customer) {
-        counter.incrementAndGet();
-        if (counter.intValue() > 0) {
-          throw new IllegalStateException("cause a failure");
-        }
+    query.findEach(customer -> {
+      counter.incrementAndGet();
+      if (counter.intValue() > 0) {
+        throw new IllegalStateException("cause a failure");
       }
     });
 
diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java
index dddff3155..943d1b1a5 100644
--- a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java
+++ b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java
@@ -25,13 +25,10 @@ public class TestQueryFindEachWhile extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEachWhile(new QueryEachWhileConsumer< Customer > () {
-
-      public boolean accept(Customer customer) {
-        counter.incrementAndGet();
-        customer.getName();
-        return true;
-      }
+    query.findEachWhile(customer -> {
+      counter.incrementAndGet();
+      customer.getName();
+      return true;
     });
 
     Assert.assertEquals(2, counter.get());
@@ -53,15 +50,12 @@ public class TestQueryFindEachWhile extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEachWhile(new QueryEachWhileConsumer<Customer>() {
-
-      public boolean accept(Customer customer) {
-        counter.incrementAndGet();
-        if (counter.intValue() > 0) {
-          throw new IllegalStateException("cause a failure");
-        }
-        return true;
+    query.findEachWhile(customer -> {
+      counter.incrementAndGet();
+      if (counter.intValue() > 0) {
+        throw new IllegalStateException("cause a failure");
       }
+      return true;
     });
 
     Assert.assertFalse("Never get here - exception thrown", true);
diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java
index 2c50253a6..1d219807e 100644
--- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java
+++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java
@@ -94,12 +94,7 @@ public class TestQueryFindIterate extends BaseTestCase {
 
     final AtomicInteger count = new AtomicInteger();
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-      @Override
-      public void accept(Customer bean) {
-        count.incrementAndGet();
-      }
-    });
+    query.findEach(bean -> count.incrementAndGet());
 
     assertEquals(2, count.get());
   }
@@ -112,16 +107,13 @@ public class TestQueryFindIterate extends BaseTestCase {
     Ebean.find(Order.class)
             //.select("orderDate")
             .where().gt("id",0).le("id",10)
-            .findEach(new QueryEachConsumer<Order>() {
-              @Override
-              public void accept(Order order) {
-                Customer customer = order.getCustomer();
-                // invoke lazy loading on customer, order details and order shipments
-                order.getId();
-                customer.getName();
-                order.getDetails().size();
-                order.getShipments().size();
-              }
+            .findEach(order -> {
+              Customer customer = order.getCustomer();
+              // invoke lazy loading on customer, order details and order shipments
+              order.getId();
+              customer.getName();
+              order.getDetails().size();
+              order.getShipments().size();
             });
 
   }
@@ -139,14 +131,11 @@ public class TestQueryFindIterate extends BaseTestCase {
       .fetch("customer", "name")
       .where().gt("id",0).le("id",10)
       .setUseCache(false)
-      .findEach(new QueryEachConsumer<Order>() {
-        @Override
-        public void accept(Order order) {
-          Customer customer = order.getCustomer();
-          customer.getName();
-          order.getDetails().size();
-          order.getShipments().size();
-        }
+      .findEach(order -> {
+        Customer customer = order.getCustomer();
+        customer.getName();
+        order.getDetails().size();
+        order.getShipments().size();
       });
 
 
@@ -179,15 +168,12 @@ public class TestQueryFindIterate extends BaseTestCase {
           .fetch("details")
           .where().gt("id",0).le("id",10)
           .order().asc("id")
-          .findEach(new QueryEachConsumer<Order>() {
-            @Override
-            public void accept(Order order) {
-              Customer customer = order.getCustomer();
-              order.getId();
-              customer.getName();
-              order.getDetails().size();
-              order.getShipments().size();
-            }
+          .findEach(order -> {
+            Customer customer = order.getCustomer();
+            order.getId();
+            customer.getName();
+            order.getDetails().size();
+            order.getShipments().size();
           });
 
     List<String> loggedSql = LoggedSqlCollector.stop();
@@ -211,11 +197,8 @@ public class TestQueryFindIterate extends BaseTestCase {
         .setMaxRows(2);
 
     // this throws an exception immediately
-    query.findEach(new QueryEachConsumer<Customer>() {
-      @Override
-      public void accept(Customer bean) {
+    query.findEach(bean -> {
 
-      }
     });
 
     if (!server.getName().equals("h2")) {
@@ -238,12 +221,9 @@ public class TestQueryFindIterate extends BaseTestCase {
         .where().gt("id", 0)
         .setMaxRows(2);
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-      @Override
-      public void accept(Customer customer) {
-        if (customer != null) {
-          throw new IllegalStateException("cause an exception");
-        }
+    query.findEach(customer -> {
+      if (customer != null) {
+        throw new IllegalStateException("cause an exception");
       }
     });
   }
diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java
index 238e48427..e863e8598 100644
--- a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java
+++ b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java
@@ -28,11 +28,7 @@ public class TestQueryFindVisit extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-      public void accept(Customer bean) {
-        counter.incrementAndGet();
-      }
-    });
+    query.findEach(bean -> counter.incrementAndGet());
 
     Assert.assertEquals(2, counter.get());
   }
@@ -53,13 +49,10 @@ public class TestQueryFindVisit extends BaseTestCase {
 
     final AtomicInteger counter = new AtomicInteger(0);
 
-    query.findEach(new QueryEachConsumer<Customer>() {
-
-      public void accept(Customer bean) {
-        counter.incrementAndGet();
-        if (counter.intValue() > 0) {
-          throw new IllegalStateException("cause a failure");
-        }
+    query.findEach(bean -> {
+      counter.incrementAndGet();
+      if (counter.intValue() > 0) {
+        throw new IllegalStateException("cause a failure");
       }
     });
 
diff --git a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java
index 3d0b2167d..92a93822c 100644
--- a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java
+++ b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java
@@ -21,12 +21,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase {
 
     Ebean.find(Order.class)
           .setLazyLoadBatchSize(2)
-          .findEach(new QueryEachConsumer<Order>() {
-            @Override
-            public void accept(Order bean) {
-              doStuff(bean);
-            }
-          });
+          .findEach(bean -> doStuff(bean));
   }
 
   @Test
@@ -40,12 +35,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase {
           .fetch("customer")
           .fetch("customer.contacts")
           .setLazyLoadBatchSize(2)
-          .findEach(new QueryEachConsumer<Order>() {
-            @Override
-            public void accept(Order bean) {
-              doStuff(bean);
-            }
-          });
+          .findEach(bean -> doStuff(bean));
   }
 
   @Test
diff --git a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java b/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java
index 652e6257e..08df73b74 100644
--- a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java
+++ b/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java
@@ -59,14 +59,11 @@ public class TestFindIterateHeapDump extends BaseTestCase {
     final AtomicInteger counter = new AtomicInteger();
 
     server.find(EBasic.class)
-        .findEach(new QueryEachConsumer<EBasic>() {
-          @Override
-          public void accept(EBasic bean) {
+        .findEach(bean -> {
 
-            int count = counter.incrementAndGet();
-            if (count == 1) {
-              dumpHeap("heap-dump13-initial.snapshot", true);
-            }
+          int count = counter.incrementAndGet();
+          if (count == 1) {
+            dumpHeap("heap-dump13-initial.snapshot", true);
           }
         });
 
diff --git a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
index 00955ed89..83c0db136 100644
--- a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
@@ -95,12 +95,7 @@ public class SqlQueryTests extends BaseTestCase {
     sqlQuery.setMaxRows(10);
 
     LoggedSqlCollector.start();
-    sqlQuery.findEach(new QueryEachConsumer<SqlRow>() {
-      @Override
-      public void accept(SqlRow bean) {
-        bean.get("id");
-      }
-    });
+    sqlQuery.findEach(bean -> bean.get("id"));
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql.get(0)).contains("limit 10");
@@ -116,12 +111,7 @@ public class SqlQueryTests extends BaseTestCase {
     final AtomicInteger count = new AtomicInteger();
 
     SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order");
-    sqlQuery.findEach(new QueryEachConsumer<SqlRow>() {
-      @Override
-      public void accept(SqlRow bean) {
-        count.incrementAndGet();
-      }
-    });
+    sqlQuery.findEach(bean -> count.incrementAndGet());
 
     assertEquals(expectedRows, count.get());
   }
@@ -134,13 +124,10 @@ public class SqlQueryTests extends BaseTestCase {
     final AtomicInteger count = new AtomicInteger();
 
     SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order order by id");
-    sqlQuery.findEachWhile(new QueryEachWhileConsumer<SqlRow>() {
-      @Override
-      public boolean accept(SqlRow bean) {
-        count.incrementAndGet();
-        Integer id = bean.getInteger("id");
-        return id < 3;
-      }
+    sqlQuery.findEachWhile(bean -> {
+      count.incrementAndGet();
+      Integer id = bean.getInteger("id");
+      return id < 3;
     });
 
     assertEquals(3, count.get());
diff --git a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java
index 43fa894db..59657d078 100644
--- a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java
+++ b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java
@@ -284,12 +284,7 @@ public class TestReadAudit extends BaseTestCase {
     final AtomicInteger count = new AtomicInteger();
     server.find(EBasicChangeLog.class)
         .where().startsWith("shortDescription", "readAudit")
-        .findEach(new QueryEachConsumer<EBasicChangeLog>() {
-          @Override
-          public void accept(EBasicChangeLog bean) {
-            count.incrementAndGet();
-          }
-        });
+        .findEach(bean -> count.incrementAndGet());
 
     assertThat(count.get()).isEqualTo(2);
     assertThat(readAuditPrepare.count).isEqualTo(1);
@@ -299,12 +294,7 @@ public class TestReadAudit extends BaseTestCase {
 
     server.find(EBasicChangeLog.class)
         .where().startsWith("shortDescription", "readAudit")
-        .findEach(new QueryEachConsumer<EBasicChangeLog>() {
-          @Override
-          public void accept(EBasicChangeLog bean) {
-            count.incrementAndGet();
-          }
-        });
+        .findEach(bean -> count.incrementAndGet());
 
     assertThat(readAuditPrepare.count).isEqualTo(2);
     assertThat(readAuditLogger.plans).hasSize(1);
diff --git a/src/test/java/com/avaje/tests/transaction/TestNested.java b/src/test/java/com/avaje/tests/transaction/TestNested.java
index 7b9ca74c6..7d0519c77 100644
--- a/src/test/java/com/avaje/tests/transaction/TestNested.java
+++ b/src/test/java/com/avaje/tests/transaction/TestNested.java
@@ -13,12 +13,7 @@ public class TestNested extends BaseTestCase {
   public void test() {
 
     try {
-      Ebean.execute(new TxRunnable() {
-        public void run() {
-
-          willFail();
-        }
-      });
+      Ebean.execute(() -> willFail());
     } catch (RuntimeException e) {
       Assert.assertEquals(e.getMessage(), "test rollback");
     }
diff --git a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java b/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java
index e5e5508fc..f8eff5f18 100644
--- a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java
+++ b/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java
@@ -43,17 +43,15 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
     Assert.assertEquals("foo2", log3.getDescription());
     Assert.assertEquals("mod0", log3.getModifiedDescription());
 
-    Ebean.execute(new TxRunnable() {  
-      public void run() {  
-        SqlUpdate update = Ebean.createSqlUpdate(  updateDml ) ;
-        update.setParameter("desc", "foo3");
-        update.setParameter("id", id);
-        update.execute();
+    Ebean.execute(() -> {
+      SqlUpdate update = Ebean.createSqlUpdate(  updateDml ) ;
+      update.setParameter("desc", "foo3");
+      update.setParameter("id", id);
+      update.execute();
 
-        SqlUpdate updateMod = Ebean.createSqlUpdate(  updateModDml ) ;
-        updateMod.setParameter("desc", "mod1");
-        updateMod.execute();
-      }  
+      SqlUpdate updateMod1 = Ebean.createSqlUpdate(  updateModDml ) ;
+      updateMod1.setParameter("desc", "mod1");
+      updateMod1.execute();
     });
 
     AuditLog log4 = Ebean.find(AuditLog.class, log.getId());