diff --git a/expected/array.out b/expected/array.out
index 4094d98492..7dcf38e32b 100644
--- a/expected/array.out
+++ b/expected/array.out
@@ -869,15 +869,15 @@ SELECT i,
 ---------------------+------------------
  {20,23,51}          | 1.73205080756888
  {33,51,20,77,23,65} | 2.44948974278318
- {23,76,34,23,2,20}  |               -1
- {20,60,45,23,29}    |               -1
- {23,89,38,20,40,95} |               -1
- {23,20,72}          |               -1
- {73,23,20}          |               -1
  {6,97,20,89,23}     |               -1
  {20,98,30,23,1,66}  |               -1
  {57,23,39,46,50,20} |               -1
  {81,20,26,22,23}    |               -1
+ {73,23,20}          |               -1
  {18,23,10,90,15,20} |               -1
+ {23,76,34,23,2,20}  |               -1
+ {20,60,45,23,29}    |               -1
+ {23,89,38,20,40,95} |               -1
+ {23,20,72}          |               -1
 (12 rows)
 
diff --git a/expected/array_1.out b/expected/array_1.out
index ec3abfb693..5c6e781def 100644
--- a/expected/array_1.out
+++ b/expected/array_1.out
@@ -862,15 +862,15 @@ SELECT i,
 ---------------------+------------------
  {20,23,51}          | 1.73205080756888
  {33,51,20,77,23,65} | 2.44948974278318
+ {18,23,10,90,15,20} |               -1
  {23,76,34,23,2,20}  |               -1
- {20,60,45,23,29}    |               -1
+ {73,23,20}          |               -1
  {23,89,38,20,40,95} |               -1
  {23,20,72}          |               -1
- {73,23,20}          |               -1
+ {20,60,45,23,29}    |               -1
+ {81,20,26,22,23}    |               -1
  {6,97,20,89,23}     |               -1
  {20,98,30,23,1,66}  |               -1
  {57,23,39,46,50,20} |               -1
- {81,20,26,22,23}    |               -1
- {18,23,10,90,15,20} |               -1
 (12 rows)
 
diff --git a/src/rumsort.c b/src/rumsort.c
index b5691301c9..96784cd192 100644
--- a/src/rumsort.c
+++ b/src/rumsort.c
@@ -488,11 +488,23 @@ rum_tuplesort_putrum(RumTuplesortstate *state, RumSortItem *item)
 {
 	MemoryContext oldcontext;
 	SortTuple stup;
+#if PG_VERSION_NUM >= 170000
+	MinimalTuple tuple = (MinimalTuple)item;
+	Size tuplen;
+	TuplesortPublic *base = TuplesortstateGetPublic((TuplesortPublic *)state);
+#endif
 
 	oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
 	copytup_rum(state, &stup, item);
 
-#if PG_VERSION_NUM >= 160000
+#if PG_VERSION_NUM >= 170000
+	/* GetMemoryChunkSpace is not supported for bump contexts */
+	if (TupleSortUseBumpTupleCxt(base->sortopt))
+		tuplen = MAXALIGN(tuple->t_len);
+	else
+		tuplen = GetMemoryChunkSpace(tuple);
+	tuplesort_puttuple_common(state, &stup, false, tuplen);
+#elif PG_VERSION_NUM >= 160000
 	tuplesort_puttuple_common(state, &stup, false);
 #else
 	puttuple_common(state, &stup);
@@ -506,11 +518,23 @@ rum_tuplesort_putrumitem(RumTuplesortstate *state, RumScanItem *item)
 {
 	MemoryContext oldcontext;
 	SortTuple stup;
+#if PG_VERSION_NUM >= 170000
+	MinimalTuple tuple = (MinimalTuple)item;
+	Size tuplen;
+	TuplesortPublic *base = TuplesortstateGetPublic((TuplesortPublic *)state);
+#endif
 
 	oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
 	copytup_rumitem(state, &stup, item);
 
-#if PG_VERSION_NUM >= 160000
+#if PG_VERSION_NUM >= 170000
+	/* GetMemoryChunkSpace is not supported for bump contexts */
+	if (TupleSortUseBumpTupleCxt(base->sortopt))
+		tuplen = MAXALIGN(tuple->t_len);
+	else
+		tuplen = GetMemoryChunkSpace(tuple);
+	tuplesort_puttuple_common(state, &stup, false, tuplen);
+#elif PG_VERSION_NUM >= 160000
 	tuplesort_puttuple_common(state, &stup, false);
 #else
 	puttuple_common(state, &stup);
diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml
index 471ab779f2..0544d8597d 100644
--- a/travis/docker-compose.yml
+++ b/travis/docker-compose.yml
@@ -1,2 +1,3 @@
-tests:
+services:
+  tests:
     build: .