diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index b0fd2da18..0a24c78d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -36,7 +36,7 @@ public final class IdBinderSimple implements IdBinder {
     this.idProperty = idProperty;
     this.scalarType = idProperty.scalarType();
     this.expectedType = idProperty.type();
-    bindIdSql = InternString.intern(idProperty.dbColumn() + " = ? ");
+    bindIdSql = InternString.intern(idProperty.dbColumn() + " = ?");
     this.multiValueBind = multiValueBind;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 02a4e0355..7d338a915 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -651,7 +651,7 @@ final class CQueryBuilder {
           // strip the table alias for use in update statement
           idSql = idSql.replace("t0.", "");
         }
-        sb.append(idSql).append(" ");
+        sb.append(idSql);
         hasWhere = true;
       }
     }
diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
index 527146367..ebe409895 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -66,7 +66,7 @@ public class TestQueryForUpdate extends BaseTestCase {
       List<String> sql = LoggedSql.stop();
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("from o_order");
-      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ?   for update");
+      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
 
       transaction.commit();
     }
@@ -98,7 +98,7 @@ public class TestQueryForUpdate extends BaseTestCase {
       List<String> sql = LoggedSql.stop();
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("from o_order");
-      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ?   for update");
+      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
 
       transaction.commit();
     }
diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
index 81a13c894..580f7ddb6 100644
--- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
+++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
@@ -31,7 +31,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase {
 
     assertThat(sql).hasSize(1);
     if (isH2() || isPostgres()) {
-      assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t2.type, t0.truck_plate_no, t0.basic_id, t1.id, t1.some_uid, t1.foo, t1.owner_id from ttruck_holder t0 join tcar t2 on t2.plate_no = t0.truck_plate_no left join ttruck_holder_item t1 on t1.owner_id = t0.id where t0.id = ?   order by t0.id");
+      assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t2.type, t0.truck_plate_no, t0.basic_id, t1.id, t1.some_uid, t1.foo, t1.owner_id from ttruck_holder t0 join tcar t2 on t2.plate_no = t0.truck_plate_no left join ttruck_holder_item t1 on t1.owner_id = t0.id where t0.id = ? order by t0.id");
     }
   }
 
diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
index 02859e645..52462c880 100644
--- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
+++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
@@ -44,13 +44,11 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
     assertThat(found.getAddress().getCountry().getCode()).isEqualTo("NZ");
     assertThat(found.getAddress().getCountry().getName()).startsWith("New");
 
-
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(2);
-
     if (isH2()) {
-      assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.ma_street, t0.ma_suburb, t0.ma_city, t0.ma_country_code from eper_addr t0 where t0.id = ? ");
-      assertSql(sql.get(1)).contains("select t0.code, t0.name from o_country t0 where t0.code = ?  ; --bind(NZ,");
+      assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.ma_street, t0.ma_suburb, t0.ma_city, t0.ma_country_code from eper_addr t0 where t0.id = ?");
+      assertSql(sql.get(1)).contains("select t0.code, t0.name from o_country t0 where t0.code = ?; --bind(NZ,");
     }
   }
 }