diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
index 0a3385ceea..cf1633958c 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
@@ -59,7 +59,7 @@ public class Product implements Serializable
     public String description;
 
     @ManyToOne
-	@JoinFormula(value="SUBSTR(product_idnf, 1, 3)", 
+	@JoinFormula(value="SUBSTRING(product_idnf, 1, 3)",
 				 referencedColumnName="product_idnf")
 	@Fetch(FetchMode.JOIN)
     private Product productFamily;
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java
index 2361aeb5a9..7c44f60caf 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.test.annotations.target;
+import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
 /**
@@ -29,6 +30,7 @@ import javax.persistence.Embeddable;
  */
 @Embeddable
 public class SizeImpl implements Size {
+    @Column(name = "name", nullable = false)
 	private String name;
 
 	public String getName() {
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java
index 573262d1a7..5c86aaf220 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java
@@ -95,7 +95,7 @@ public class DynamicFilterTest extends BaseCoreFunctionalTestCase {
 	}
 
 	@Test
-	@SkipForDialect(IngresDialect.class)
+	@SkipForDialect( value = {SybaseASE15Dialect.class, IngresDialect.class})
 	public void testSqlSyntaxOfFiltersWithUnions() {
 		Session session = openSession();
 		session.enableFilter( "unioned" );
diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java
index 5a4e60b7ec..003fdc818e 100644
--- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java
+++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java
@@ -57,7 +57,7 @@ public class AggregationResultTest extends AbstractMetamodelSpecificTest {
 		product.setPartNumber( ( (long) Integer.MAX_VALUE ) + 1 );
 		product.setRating( 1.999f );
 		product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
-		product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
+		product.setSomeBigDecimal( BigDecimal.valueOf( 987654.32 ) );
 		em.persist( product );
 		em.getTransaction().commit();
 		em.close();
diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
index 925d90cbda..cccd08d435 100644
--- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
+++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
@@ -69,7 +69,7 @@ public class ExpressionsTest extends AbstractMetamodelSpecificTest {
 		product.setPartNumber( ((long)Integer.MAX_VALUE) + 1 );
 		product.setRating( 1.999f );
 		product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
-		product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
+		product.setSomeBigDecimal( BigDecimal.valueOf( 987654.32 ) );
 		em.persist( product );
 		em.getTransaction().commit();
 		em.close();
diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java
index cde94b274f..fd51fe2bf7 100644
--- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java
+++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java
@@ -43,6 +43,7 @@ import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.Oracle10gDialect;
 import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.SkipForDialect;
 
 import org.junit.Test;
 
@@ -269,14 +270,11 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
 	}
 
 	@Test
+    @SkipForDialect( value = HSQLDialect.class)
 	public void testContendedPessimisticLock() throws Exception {
 		EntityManager em = getOrCreateEntityManager();
 		final EntityManager em2 = createIsolatedEntityManager();
-		// TODO:  replace dialect instanceof test with a Dialect.hasCapability (e.g. supportsPessimisticWriteLock)
-		if ( getDialect() instanceof HSQLDialect) {
-            log.info("skipping testContendedPessimisticLock");
-			return;
-		}
+
 		Lock lock = new Lock();
 		Thread t = null;
 		try {