diff --git a/.travis.yml b/.travis.yml
index fd57d799d6..9cd236a889 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=17
+    - PG_VERSION=17 LEVEL=hardcore
     - PG_VERSION=16
     - PG_VERSION=16 LEVEL=hardcore
     - PG_VERSION=15
diff --git a/src/rumsort.c b/src/rumsort.c
index b5691301c9..3a87500beb 100644
--- a/src/rumsort.c
+++ b/src/rumsort.c
@@ -492,12 +492,15 @@ rum_tuplesort_putrum(RumTuplesortstate *state, RumSortItem *item)
 	oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
 	copytup_rum(state, &stup, item);
 
-#if PG_VERSION_NUM >= 160000
+#if PG_VERSION_NUM >= 170000
+	tuplesort_puttuple_common(state, &stup, false, GetMemoryChunkSpace(&stup));
+#elif PG_VERSION_NUM == 160000
 	tuplesort_puttuple_common(state, &stup, false);
 #else
 	puttuple_common(state, &stup);
 #endif
 
+
 	MemoryContextSwitchTo(oldcontext);
 }
 
@@ -510,7 +513,9 @@ rum_tuplesort_putrumitem(RumTuplesortstate *state, RumScanItem *item)
 	oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
 	copytup_rumitem(state, &stup, item);
 
-#if PG_VERSION_NUM >= 160000
+#if PG_VERSION_NUM >= 170000
+	tuplesort_puttuple_common(state, &stup, false, GetMemoryChunkSpace(&stup));
+#elif PG_VERSION_NUM == 160000
 	tuplesort_puttuple_common(state, &stup, false);
 #else
 	puttuple_common(state, &stup);