diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index ffa477b96..0cd97846e 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -77,6 +77,12 @@ jobs:
         run: |
           nm -gU ./build/release/libduckdb_java.so_linux_amd64
 
+      - name: Check Module Name
+        run: |
+          java \
+            --module-path ./build/release/duckdb_jdbc.jar \
+            -d duckdb.jdbc
+
       - name: JDBC Tests EL8
         if: ${{ inputs.skip_tests != 'true' }}
         run: |
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 388336580..4db517e17 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ContactAddress: mark@duckdblabs.com
 Bundle-Copyright: Copyright (c) DuckDB Labs
 Export-Package: org.duckdb, org.duckdb.io, org.duckdb.user
 Import-Package: javax.sql, org.osgi.framework;resolution:=optional
+Automatic-Module-Name: duckdb.jdbc