diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/LockTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/LockTest.java
index fecfce0cfb..d6b4b25868 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/LockTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/LockTest.java
@@ -25,6 +25,7 @@ package org.hibernate.jpa.test.lock;
 
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.Oracle10gDialect;
+import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.PostgreSQL81Dialect;
 import org.hibernate.dialect.SybaseASE15Dialect;
 import org.hibernate.ejb.AvailableSettings;
@@ -328,8 +329,14 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
 	}
 
 	@Test
-	// ASE15.5 will generate select...holdlock and fail at this test, but ASE15.7 passes it. Skip it for ASE15.5 only.
-	@SkipForDialect(value = { HSQLDialect.class, SybaseASE15Dialect.class },strictMatching = true, jiraKey = "HHH-6820")
+	
+	@SkipForDialects({
+			@SkipForDialect(HSQLDialect.class),
+			// ASE15.5 will generate select...holdlock and fail at this test, but ASE15.7 passes it. Skip it for ASE15.5
+			// only.
+			@SkipForDialect(value = { SybaseASE15Dialect.class }, strictMatching = true, jiraKey = "HHH-6820"),
+			// TODO Remove once HHH-8001 is fixed.
+			@SkipForDialect(value = { Oracle8iDialect.class }, jiraKey = "HHH-8001") })
 	public void testContendedPessimisticLock() throws Exception {
 		final EntityManager em = getOrCreateEntityManager();
 		final EntityManager isolatedEntityManager = createIsolatedEntityManager();
@@ -719,6 +726,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
 	@Test
 	@RequiresDialect( Oracle10gDialect.class )
 	@RequiresDialectFeature( DialectChecks.SupportsLockTimeouts.class )
+	@FailureExpected( jiraKey = "HHH-8001" )
 	public void testQueryTimeout() throws Exception {
 
 		EntityManager em = getOrCreateEntityManager();
@@ -812,6 +820,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
 	@Test
 	@RequiresDialect( Oracle10gDialect.class )
 	@RequiresDialectFeature( DialectChecks.SupportsLockTimeouts.class )
+	@FailureExpected( jiraKey = "HHH-8001" )
 	public void testQueryTimeoutEMProps() throws Exception {
 		EntityManager em = getOrCreateEntityManager();
 		Map<String, Object> queryTimeoutProps = new HashMap<String, Object>();