diff --git a/metadata/index.json b/metadata/index.json
index 5e19f83df..50ad2cdea 100644
--- a/metadata/index.json
+++ b/metadata/index.json
@@ -293,6 +293,10 @@
   "allowed-packages" : [ "org.hibernate", "jakarta", "org.h2.Driver", "org.postgresql.Driver", "com.mysql.cj.jdbc.Driver", "org.hsqldb.jdbc.JDBCDriver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "org.mariadb.jdbc.Driver" ],
   "directory" : "org.hibernate/hibernate-core",
   "module" : "org.hibernate:hibernate-core"
+}, {
+  "allowed-packages" : [ "org.hibernate" ],
+  "directory" : "org.hibernate/hibernate-spatial",
+  "module" : "org.hibernate:hibernate-spatial"
 }, {
   "allowed-packages" : [ "org.jboss" ],
   "directory" : "org.jboss.logging/jboss-logging",
diff --git a/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/index.json b/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/index.json
new file mode 100644
index 000000000..768b5502a
--- /dev/null
+++ b/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/index.json
@@ -0,0 +1,3 @@
+[
+  "reflect-config.json"
+]
diff --git a/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/reflect-config.json b/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/reflect-config.json
new file mode 100644
index 000000000..308d37df5
--- /dev/null
+++ b/metadata/org.hibernate/hibernate-spatial/6.5.0.Final/reflect-config.json
@@ -0,0 +1,16 @@
+[
+  {
+    "name": "org.hibernate.spatial.HSMessageLogger_$logger",
+    "condition": {
+      "typeReachable": "org.hibernate.spatial.integration.SpatialInitializer"
+    },
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": [
+          "org.jboss.logging.Logger"
+        ]
+      }
+    ]
+  }
+]
diff --git a/metadata/org.hibernate/hibernate-spatial/index.json b/metadata/org.hibernate/hibernate-spatial/index.json
new file mode 100644
index 000000000..305da229c
--- /dev/null
+++ b/metadata/org.hibernate/hibernate-spatial/index.json
@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "6.5.0.Final",
+    "module": "org.hibernate:hibernate-spatial",
+    "tested-versions": [
+      "6.5.0.Final"
+    ]
+  }
+]
diff --git a/tests/src/index.json b/tests/src/index.json
index 1b4fd7f4c..c086d0ffa 100644
--- a/tests/src/index.json
+++ b/tests/src/index.json
@@ -478,6 +478,12 @@
     "name" : "org.hibernate:hibernate-core",
     "versions" : [ "5.6.14.Final" ]
   } ]
+}, {
+  "test-project-path" : "org.hibernate/hibernate-spatial/6.5.0.Final",
+  "libraries" : [ {
+    "name" : "org.hibernate:hibernate-spatial",
+    "versions" : [ "6.5.0.Final" ]
+  } ]
 }, {
   "test-project-path" : "org.jboss.logging/jboss-logging/3.5.0.Final",
   "libraries" : [ {
diff --git a/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/.gitignore b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/.gitignore
new file mode 100644
index 000000000..c98c7875b
--- /dev/null
+++ b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/.gitignore
@@ -0,0 +1,4 @@
+gradlew.bat
+gradlew
+gradle/
+build/
diff --git a/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/build.gradle b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/build.gradle
new file mode 100644
index 000000000..c5ad1c217
--- /dev/null
+++ b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/build.gradle
@@ -0,0 +1,17 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+plugins {
+    id "org.graalvm.internal.tck"
+}
+
+String libraryVersion = tck.testedLibraryVersion.get()
+
+dependencies {
+    testImplementation "org.hibernate:hibernate-spatial:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+}
diff --git a/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/gradle.properties b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/gradle.properties
new file mode 100644
index 000000000..7573fc0da
--- /dev/null
+++ b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/gradle.properties
@@ -0,0 +1,2 @@
+library.version = 6.5.0.Final
+metadata.dir = org.hibernate/hibernate-spatial/6.5.0.Final/
diff --git a/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/settings.gradle b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/settings.gradle
new file mode 100644
index 000000000..1c89b7793
--- /dev/null
+++ b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    def tckPath = Objects.requireNonNullElse(
+            System.getenv("GVM_TCK_TCKDIR"),
+            "../../../../tck-build-logic"
+    )
+    includeBuild(tckPath)
+}
+
+plugins {
+    id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
+}
+
+rootProject.name = 'org.hibernate.hibernate-spatial_tests'
diff --git a/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/src/test/java/org_hibernate/hibernate_spatial/HibernateSpatialTest.java b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/src/test/java/org_hibernate/hibernate_spatial/HibernateSpatialTest.java
new file mode 100644
index 000000000..592bf2c6d
--- /dev/null
+++ b/tests/src/org.hibernate/hibernate-spatial/6.5.0.Final/src/test/java/org_hibernate/hibernate_spatial/HibernateSpatialTest.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package org_hibernate.hibernate_spatial;
+
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.spatial.integration.SpatialInitializer;
+import org.junit.jupiter.api.Test;
+
+class HibernateSpatialTest {
+
+    @Test
+    void test() throws Exception {
+        new SpatialInitializer().contribute(new StandardServiceRegistryBuilder());
+    }
+}