diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
index e921d5aa3..7c59031ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
@@ -3,11 +3,11 @@ package io.ebeaninternal.server.logger;
 import io.ebeaninternal.api.SpiLogger;
 import org.slf4j.Logger;
 
-public final class DSpiLogger implements SpiLogger {
+final class DSpiLogger implements SpiLogger {
 
   private final Logger logger;
 
-  public DSpiLogger(Logger logger) {
+  DSpiLogger(Logger logger) {
     this.logger = logger;
   }
 
diff --git a/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java b/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java
index 1cdad509c..f76368f6c 100644
--- a/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java
+++ b/ebean-test/src/main/java/io/ebean/test/CaptureLogger.java
@@ -8,12 +8,10 @@ import java.util.List;
 /**
  * Capture the log messages (executed SQL) for testing.
  */
-class CaptureLogger implements SpiLogger {
+final class CaptureLogger implements SpiLogger {
 
   private final SpiLogger wrapped;
-
   private List<String> messages = new ArrayList<>();
-
   private boolean active;
 
   CaptureLogger(SpiLogger wrapped) {
diff --git a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
index c30e25790..aecc77026 100644
--- a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
+++ b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
@@ -2,7 +2,7 @@ package io.ebean.test;
 
 import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
-import io.ebeaninternal.server.logger.DSpiLogger;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -15,11 +15,39 @@ public class CapturingLoggerFactory implements SpiLoggerFactory {
 
   @Override
   public SpiLogger create(String name) {
-
-    DSpiLogger logger = new DSpiLogger(LoggerFactory.getLogger(name));
+    SpiLogger logger = new LogAdapter(LoggerFactory.getLogger(name));
     if (name.equals("io.ebean.SQL")) {
       return LoggedSql.register(logger);
     }
     return logger;
   }
+
+  private static final class LogAdapter implements SpiLogger {
+
+    private final Logger logger;
+
+    LogAdapter(Logger logger) {
+      this.logger = logger;
+    }
+
+    @Override
+    public boolean isDebug() {
+      return logger.isDebugEnabled();
+    }
+
+    @Override
+    public boolean isTrace() {
+      return logger.isTraceEnabled();
+    }
+
+    @Override
+    public void debug(String msg) {
+      logger.debug(msg);
+    }
+
+    @Override
+    public void trace(String msg) {
+      logger.trace(msg);
+    }
+  }
 }
diff --git a/ebean-test/src/main/java/io/ebean/test/LoggedSql.java b/ebean-test/src/main/java/io/ebean/test/LoggedSql.java
index 624451f12..4c8f017a9 100644
--- a/ebean-test/src/main/java/io/ebean/test/LoggedSql.java
+++ b/ebean-test/src/main/java/io/ebean/test/LoggedSql.java
@@ -1,7 +1,6 @@
 package io.ebean.test;
 
 import io.ebeaninternal.api.SpiLogger;
-import io.ebeaninternal.server.logger.DSpiLogger;
 
 import java.util.List;
 
@@ -44,7 +43,7 @@ public class LoggedSql {
   /**
    * Internal use - register the logger for <code>io.ebean.SQL</code>.
    */
-  static SpiLogger register(DSpiLogger logger) {
+  static SpiLogger register(SpiLogger logger) {
     if (sqlLogger == null) {
       sqlLogger = new CaptureLogger(logger);
     }