diff --git a/build.gradle b/build.gradle
index 7d1a493ff0..123ad83475 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ allprojects {
 }
 
 ext {
-	hibernateTargetVersion = '5.2.13-SNAPSHOT'
+	hibernateTargetVersion = '5.3.0-SNAPSHOT'
 	expectedGradleVersion = '4.2'
 	baselineJavaVersion = '1.8'
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
index c7618617b1..b6da120565 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
@@ -8,6 +8,7 @@ package org.hibernate.procedure.spi;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import javax.persistence.FlushModeType;
 import javax.persistence.Parameter;
 import javax.persistence.ParameterMode;
@@ -20,6 +21,16 @@ import org.hibernate.query.spi.QueryImplementor;
  * @author Steve Ebersole
  */
 public interface ProcedureCallImplementor<R> extends ProcedureCall, QueryImplementor<R> {
+	@Override
+	default List<R> getResultList() {
+		return list();
+	}
+
+	@Override
+	default R getSingleResult() {
+		return uniqueResult();
+	}
+
 	@Override
 	ProcedureCallImplementor<R> setHint(String hintName, Object value);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/compliance/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/compliance/package-info.java
new file mode 100644
index 0000000000..0ce882b1ac
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/compliance/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+
+/**
+ * Test package for investigating JPA TCK failures - to reproduce them
+ * and, if caused by a Hibernate bug, make sure it does not regress later
+ */
+package org.hibernate.test.jpa.compliance;
diff --git a/libraries.gradle b/libraries.gradle
index 35f5ac79e3..71b56cffe3 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -52,7 +52,7 @@ ext {
             byteBuddy:      "net.bytebuddy:byte-buddy:${byteBuddyVersion}",
 
             // javax
-            jpa:            'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final',
+            jpa:            'javax.persistence:javax.persistence-api:2.2',
             jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final',
             validation:     'javax.validation:validation-api:1.1.0.Final',
             jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',