diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index daf725b39..2ec125a23 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -121,7 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
   @Test
   @Transactional(batch = PersistBatch.ALL)
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs
   public void transactional_flushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
@@ -144,7 +144,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
   }
 
   @Test
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA})
   public void testFlushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index e19bdf821..a0b5e5d4c 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -138,7 +138,11 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id from o_customer t0 where t0.name = ?");
+    if (isSqlServer()) {
+      assertThat(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?");
+    } else {
+      assertThat(sql.get(0)).contains("select t0.id from o_customer t0 where t0.name = ?");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index 6e2f33ddc..7d9e1d3c0 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
 public class TestInsertBatchThenUpdate extends BaseTestCase {
 
   @Test
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs
   public void test() {
 
     LoggedSqlCollector.start();
@@ -50,7 +50,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql = LoggedSqlCollector.stop();
-      assertEquals(3, loggedSql.size());
+      assertThat(loggedSql).hasSize(3);
       assertThat(loggedSql.get(0)).contains("insert into td_parent");
       assertThat(loggedSql.get(1)).contains("insert into td_child ");
       assertThat(loggedSql.get(2)).contains("update td_parent set parent_name=? where parent_id=?");
diff --git a/src/test/java/org/tests/model/composite/CkeClientKey.java b/src/test/java/org/tests/model/composite/CkeClientKey.java
index c32bdb10f..2d4456ce9 100644
--- a/src/test/java/org/tests/model/composite/CkeClientKey.java
+++ b/src/test/java/org/tests/model/composite/CkeClientKey.java
@@ -3,6 +3,8 @@ package org.tests.model.composite;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
 import java.util.Objects;
 
 @Embeddable
@@ -14,6 +16,7 @@ public class CkeClientKey {
 
   @Basic(optional = false)
   @Column(name = "cod_client")
+  @Size(max=100)
   private String codClient;
 
   public CkeClientKey(int codCompany, String codClient) {
diff --git a/src/test/java/org/tests/model/composite/CkeUserKey.java b/src/test/java/org/tests/model/composite/CkeUserKey.java
index 637a10cf7..09939ead3 100644
--- a/src/test/java/org/tests/model/composite/CkeUserKey.java
+++ b/src/test/java/org/tests/model/composite/CkeUserKey.java
@@ -3,6 +3,8 @@ package org.tests.model.composite;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
 import java.util.Objects;
 
 @Embeddable
@@ -10,6 +12,7 @@ public class CkeUserKey {
 
   @Basic(optional = false)
   @Column(name = "username")
+  @Size(max=100)
   private String username;
 
   @Basic(optional = false)
diff --git a/src/test/java/org/tests/model/onetoone/OtoAone.java b/src/test/java/org/tests/model/onetoone/OtoAone.java
index 9716b4a37..fd0b0c58b 100644
--- a/src/test/java/org/tests/model/onetoone/OtoAone.java
+++ b/src/test/java/org/tests/model/onetoone/OtoAone.java
@@ -2,11 +2,13 @@ package org.tests.model.onetoone;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OtoAone {
 
   @Id
+  @Size(max = 100)
   private String id;
 
   private String description;
diff --git a/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
index d60bfb5c1..ac00af5d1 100644
--- a/src/test/java/org/tests/model/onetoone/OtoAtwo.java
+++ b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
@@ -4,11 +4,13 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OtoAtwo {
 
   @Id
+  @Size(max = 100)
   private String id;
 
   private String description;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
index 4ba7c12fa..5a22543a1 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
@@ -4,11 +4,13 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OrpDetail {
 
   @Id
+  @Size(max=100)
   String id;
 
   String detail;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
index 4f369ce6b..6fe3be4dd 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
@@ -3,11 +3,13 @@ package org.tests.model.orphanremoval;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OrpDetail2 {
 
   @Id
+  @Size(max=100)
   String id;
 
   String detail;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
index 2bba0d742..cd443a84c 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
@@ -7,6 +7,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Cache
@@ -14,6 +16,7 @@ import java.util.List;
 public class OrpMaster {
 
   @Id
+  @Size(max = 100)
   String id;
 
   String name;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
index a6d65f14f..09338bdda 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
@@ -7,6 +7,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Cache
@@ -14,6 +16,7 @@ import java.util.List;
 public class OrpMaster2 {
 
   @Id
+  @Size(max=100)
   String id;
 
   String name;
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index a1c9d7767..733af34a0 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -3,6 +3,9 @@ package org.tests.query.orderby;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -38,6 +41,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER}) // do not support nulls first/last
   public void testDistinctOn() {
 
     MRole role = Ebean.getReference(MRole.class, 1);