diff --git a/.github/workflows/extension_ci.yml b/.github/workflows/extension_ci.yml
index 4156c6ab..81711966 100644
--- a/.github/workflows/extension_ci.yml
+++ b/.github/workflows/extension_ci.yml
@@ -24,18 +24,27 @@ on:
 
 jobs:
   test:
-    name: Run tests
+    name: Test 🐘 ${{ matrix.pg }} with pg_partman ${{ matrix.partman }}
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        pg: [12, 13, 14, 15, 16]
+        pg: [12, 13, 14, 15, 16, 17]
+        partman: [4.7.3, 5.1.0]
+        exclude:
+          # pg_partman does not support pg < 14
+          - pg: 12
+            partman: 5.1.0
+          - pg: 13
+            partman: 5.1.0
     container: pgxn/pgxn-tools
     steps:
       - run: pg-start ${{ matrix.pg }}
         working-directory: ./
       - uses: actions/checkout@v4
-      - run: pgxn install 'pg_partman=4.7.3'
+      # - run: pgxn install 'pg_partman=${{ matrix.partman }}'
+      # TODO: use pgxn to install pg_partman once 5.x is available in pgxn
+      - run: make install-pg-partman PG_PARTMAN_VER=${{ matrix.partman }}
       - run: pg-build-test
 
   publish:
diff --git a/pgmq-extension/Makefile b/pgmq-extension/Makefile
index 7609ab62..4711dc69 100644
--- a/pgmq-extension/Makefile
+++ b/pgmq-extension/Makefile
@@ -5,6 +5,7 @@ TESTS         = $(wildcard test/sql/*.sql)
 REGRESS       = $(patsubst test/sql/%.sql,%,$(TESTS))
 REGRESS_OPTS ?= --inputdir=test
 EXTRA_CLEAN   = $(EXTENSION)-$(EXTVERSION).zip sql/$(EXTENSION)--$(EXTVERSION).sql META.json Trunk.toml
+PG_PARTMAN_VER = 5.1.0
 
 # pg_isolation_regress available in v14 and higher.
 ifeq ($(shell test $$(pg_config --version | awk '{print $$2}' | awk 'BEGIN { FS = "." }; { print $$1 }') -ge 14; echo $$?),0)
@@ -39,7 +40,7 @@ Trunk.toml:
 install-pg-partman:
 	git clone https://github.com/pgpartman/pg_partman.git && \
 	cd pg_partman && \
-	git checkout v5.1.0 && \
+	git checkout v${PG_PARTMAN_VER} && \
 	make && \
 	make install PG_CONFIG=$(PG_CONFIG) && \
 	cd ../ && rm -rf pg_partman
diff --git a/pgmq-extension/test/expected/base.out b/pgmq-extension/test/expected/base.out
index 62cca0d2..c527f5da 100644
--- a/pgmq-extension/test/expected/base.out
+++ b/pgmq-extension/test/expected/base.out
@@ -452,7 +452,7 @@ SELECT msg_id from pgmq.read('test_set_vt_queue', 1, 1);
 (1 row)
 
 -- test_partitioned_delete
-\set partition_interval 1
+\set partition_interval 2
 \set retention_interval 2
 -- We first will drop pg_partman and assert that create fails without the
 -- extension installed
diff --git a/pgmq-extension/test/sql/base.sql b/pgmq-extension/test/sql/base.sql
index 7b50153e..fe546038 100644
--- a/pgmq-extension/test/sql/base.sql
+++ b/pgmq-extension/test/sql/base.sql
@@ -175,7 +175,7 @@ SELECT msg_id FROM pgmq.set_vt('test_set_vt_queue', :first_msg_id, 0);
 SELECT msg_id from pgmq.read('test_set_vt_queue', 1, 1);
 
 -- test_partitioned_delete
-\set partition_interval 1
+\set partition_interval 2
 \set retention_interval 2
 
 -- We first will drop pg_partman and assert that create fails without the