diff --git a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
index b2028cadc..01db004c4 100644
--- a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
+++ b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
@@ -1,6 +1,6 @@
 package io.ebean.plugin;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.config.DatabaseConfig;
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Extensions to Database API made available to plugins.
  */
-public interface SpiServer extends EbeanServer {
+public interface SpiServer extends Database {
 
   /**
    * Return the DatabaseConfig.
diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java
index d20e4445a..b3898dfad 100644
--- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java
+++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java
@@ -5,9 +5,9 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.annotation.Platform;
 import io.ebean.plugin.SpiServer;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public class TestNativeILikeExpression extends BaseTestCase {
 
     SpiServer pluginApi = server().getPluginApi();
     boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike();
-    Platform platform = pluginApi.getDatabasePlatform().getPlatform();
+    Platform platform = pluginApi.getPlatform().base();
 
     return expressionNativeIlike && platform == Platform.POSTGRES;
   }
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index e16414594..110fcb943 100644
--- a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DbMigrationTest extends BaseTestCase {
 
   private void runScript(boolean expectErrors, String scriptName) throws IOException {
-    String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().getPluginApi().getDatabasePlatform().getName()+"/" + scriptName);
+    String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().getPlatform().name().toLowerCase() + "/" + scriptName);
     runScript(expectErrors, ddl, scriptName);
   }