diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java
new file mode 100644
index 0000000000..a2640c07b0
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors.  All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.dialect;
+
+import org.junit.Test;
+
+import java.sql.SQLException;
+import org.hibernate.JDBCException;
+import org.hibernate.PessimisticLockException;
+import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
+
+/**
+ * Testing of patched support for PostgreSQL Lock error detection. HHH-7251
+ *
+ * @author Bryan Varner
+ */
+@TestForIssue( jiraKey = "HHH-7251" )
+public class PostgreSQL81DialectTestCase extends BaseUnitTestCase {
+	
+	@Test
+	public void testDeadlockException() {
+		PostgreSQL81Dialect dialect = new PostgreSQL81Dialect();
+		SQLExceptionConversionDelegate delegate = dialect.buildSQLExceptionConversionDelegate();
+		assertNotNull(delegate);
+		
+		JDBCException exception = delegate.convert(new SQLException("Deadlock Detected", "40P01"), "", "");
+		assertTrue(exception instanceof LockAcquisitionException);
+	}
+	
+	@Test
+	public void testTimeoutException() {
+		PostgreSQL81Dialect dialect = new PostgreSQL81Dialect();
+		SQLExceptionConversionDelegate delegate = dialect.buildSQLExceptionConversionDelegate();
+		assertNotNull(delegate);
+		
+		JDBCException exception = delegate.convert(new SQLException("Lock Not Available", "55P03"), "", "");
+		assertTrue(exception instanceof PessimisticLockException);
+	}
+}