diff --git a/pom.xml b/pom.xml
index b505f45c5..5fc6b029f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>6.4.0.jre8</version>
+      <version>7.2.0.jre8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index c5dca5d7e..0e30ded30 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -143,7 +143,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
 
     } else {
       assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
@@ -175,7 +175,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, "
           + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     } else {
       assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
           + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 4be7f66f8..2360772af 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -364,6 +364,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchLimit() {
 
     Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
@@ -392,6 +393,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchManyPropertiesLimit() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index e9dcfb629..64d0364d1 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -203,6 +203,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void noflushWhenIdIsLoaded() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
index fb6a7d147..e78463fe9 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
@@ -5,12 +5,14 @@ import io.ebean.annotation.Cache;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.validation.constraints.Size;
 
 @Entity
 @Cache
 public class PersonCacheEmail {
 
   @Id
+  @Size(max=128)
   private String id;
 
   @ManyToOne
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
index cd5325163..bc24ce960 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
@@ -4,12 +4,14 @@ import io.ebean.annotation.Cache;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.validation.constraints.Size;
 
 @Entity
 @Cache
 public class PersonCacheInfo {
 
   @Id
+  @Size(max=128)
   private String personId;
 
   private String name;
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
index e0f3ed0f4..f6c2d340e 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
@@ -2,6 +2,9 @@ package org.tests.model.onetoone;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -12,6 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestOneToOneOrphanRemove extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void base() {
 
     OtoCust jack = new OtoCust("Jack");
diff --git a/src/test/java/org/tests/query/cache/Position.java b/src/test/java/org/tests/query/cache/Position.java
index 0e98ae65d..3d1060fd4 100644
--- a/src/test/java/org/tests/query/cache/Position.java
+++ b/src/test/java/org/tests/query/cache/Position.java
@@ -4,8 +4,10 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "e_position")
 public class Position {
 	@Id
 	@GeneratedValue