diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
index 88049a4d07..d4200b4b2b 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
@@ -253,8 +253,8 @@ public class QueryBuilderTest extends BaseEntityManagerFunctionalTestCase {
 						cb.function(
 								"substring",
 								String.class,
-								cb.literal( 1 ),
 								root.get( Customer_.name ),
+								cb.literal( 1 ),
 								cb.literal( 1 )
 						),
 						cb.literal( "a" )
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/TreatKeywordTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/TreatKeywordTest.java
index e6ebc33ea7..b1033b5c16 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/TreatKeywordTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/TreatKeywordTest.java
@@ -76,7 +76,7 @@ public class TreatKeywordTest extends BaseEntityManagerFunctionalTestCase {
 		criteria.where(
 				builder.equal(
 						builder.treat( root, Human.class ).get( "name" ),
-						2
+						"2"
 				)
 		);
 		em.createQuery( criteria ).getResultList();
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Product.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Product.java
index c4028e98f7..b353911f50 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Product.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Product.java
@@ -135,6 +135,7 @@ public class Product implements java.io.Serializable {
 		this.someBigInteger = someBigInteger;
 	}
 
+	@Column( precision = 10, scale = 3)
 	public BigDecimal getSomeBigDecimal() {
 		return someBigDecimal;
 	}