diff --git a/Makefile b/Makefile
index 6ce9e46..0b5fafe 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,6 @@ ifeq ($(shell test $(VERSION_NUM) -lt 100000; echo $$?),0)
 REGRESS := $(filter-out parallel, $(REGRESS))
 endif
 
-ifeq ($(shell test $(VERSION_NUM) -ge 90600; echo $$?),0)
-PGOPTIONS+= "--max_parallel_workers_per_gather=0"
-endif
-
 
 PLATFORM 	 = $(shell uname -s)
 
@@ -53,9 +49,6 @@ all: $(EXTENSION)--$(EXTVERSION).sql
 $(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	cp $< $@
 
-installcheck: submake $(REGRESS_PREP)
-	PGOPTIONS=$(PGOPTIONS) $(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
-
 prep_kafka:
 	./test/init_kafka.sh
 
diff --git a/test/expected/kafka_test.out b/test/expected/kafka_test.out
index fafdb80..71516d3 100644
--- a/test/expected/kafka_test.out
+++ b/test/expected/kafka_test.out
@@ -1,5 +1,6 @@
 \i test/sql/setup.inc
 \set ECHO none
+SET max_parallel_workers_per_gather = 0;
 /*
  * Returns EXPLAIN ANALYZE result without any arbitrary numbers like costs
  * or execution time.
diff --git a/test/expected/parallel.out b/test/expected/parallel.out
index 85c0f1b..b2218a3 100644
--- a/test/expected/parallel.out
+++ b/test/expected/parallel.out
@@ -16,6 +16,8 @@ ALTER FOREIGN TABLE kafka_test_part OPTIONS(ADD num_partitions '4');
 set max_parallel_workers_per_gather=2;
 set max_parallel_workers=8;
 set parallel_setup_cost=0;
+set parallel_tuple_cost=0;
+set min_parallel_table_scan_size=0;
 ANALYZE kafka_test_part;
 EXPLAIN (COSTS OFF) SELECT * FROM kafka_test_part ;
                     QUERY PLAN                    
diff --git a/test/sql/kafka_test.sql b/test/sql/kafka_test.sql
index 5b31a5c..866b333 100644
--- a/test/sql/kafka_test.sql
+++ b/test/sql/kafka_test.sql
@@ -1,5 +1,7 @@
 \i test/sql/setup.inc
 
+SET max_parallel_workers_per_gather = 0;
+
 /*
  * Returns EXPLAIN ANALYZE result without any arbitrary numbers like costs
  * or execution time.
diff --git a/test/sql/parallel.sql b/test/sql/parallel.sql
index 0cd1730..5e58d03 100644
--- a/test/sql/parallel.sql
+++ b/test/sql/parallel.sql
@@ -17,6 +17,8 @@ ALTER FOREIGN TABLE kafka_test_part OPTIONS(ADD num_partitions '4');
 set max_parallel_workers_per_gather=2;
 set max_parallel_workers=8;
 set parallel_setup_cost=0;
+set parallel_tuple_cost=0;
+set min_parallel_table_scan_size=0;
 
 ANALYZE kafka_test_part;
 EXPLAIN (COSTS OFF) SELECT * FROM kafka_test_part ;