diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
index 5ab596a136..98c1260176 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
@@ -177,7 +177,10 @@ public class ProcedureParameterMetadataImpl implements ProcedureParameterMetadat
 	@Override
 	public Set<? extends QueryParameter<?>> getRegistrations() {
 		//noinspection unchecked
-		return parameters.stream().collect( Collectors.toSet());
+		if ( parameters == null ) {
+			return Collections.emptySet();
+		}
+		return parameters.stream().collect( Collectors.toSet() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/procedure/H2StoreProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/procedure/H2StoreProcedureTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
index c7b3dc5ce0..c1c85b72db 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jpa/procedure/H2StoreProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
@@ -4,7 +4,7 @@
  * 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>.
  */
-package org.hibernate.test.jpa.procedure;
+package org.hibernate.orm.test.jpa.procedure;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityManager;