diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
index f378dbd29..2e00493fe 100644
--- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
+++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
@@ -132,7 +132,7 @@ public class TestIdClassScalar extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id = ?  and t0.user_id = ?");
+    assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id=? and t0.user_id=?");
     assertSql(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?");
   }
 
@@ -178,7 +178,7 @@ public class TestIdClassScalar extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id = ?  and t0.user_id = ?");
+    assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id=? and t0.user_id=?");
     assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
 
   }
diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
index 0bd8ddef3..ffe82ac75 100644
--- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
+++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
@@ -48,7 +48,7 @@ public class TestHistoryEmbeddedId extends BaseTestCase {
     assertThat(namePair.getOldValue()).isEqualTo("ten");
 
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from hembi_bean_with_history t0 where t0.part = ?  and t0.brand = ?");
+    assertThat(sql.get(0)).contains("from hembi_bean_with_history t0 where t0.part=? and t0.brand=?");
     if (isH2()) {
       assertThat(sql.get(0)).contains("order by t0.sys_period_start desc");
     } else if (isPostgres()) {