diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out
index ebe3f5573..2c73cde0a 100644
--- a/src/test/regress/expected/multi_explain.out
+++ b/src/test/regress/expected/multi_explain.out
@@ -2,11 +2,12 @@
 -- MULTI_EXPLAIN
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
--- print major version to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
- major_version 
----------------
- 10
+-- print whether we're using version > 9 to make version-specific tests clear
+SHOW server_version \gset
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ t
 (1 row)
 
 \a\t
diff --git a/src/test/regress/expected/multi_explain_0.out b/src/test/regress/expected/multi_explain_0.out
index 09ec08e33..e3f7d231a 100644
--- a/src/test/regress/expected/multi_explain_0.out
+++ b/src/test/regress/expected/multi_explain_0.out
@@ -2,11 +2,12 @@
 -- MULTI_EXPLAIN
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
--- print major version to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
- major_version 
----------------
- 9.6
+-- print whether we're using version > 9 to make version-specific tests clear
+SHOW server_version \gset
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ f
 (1 row)
 
 \a\t
diff --git a/src/test/regress/expected/multi_large_table_join_planning.out b/src/test/regress/expected/multi_large_table_join_planning.out
index 41db9b4e0..8bf29b367 100644
--- a/src/test/regress/expected/multi_large_table_join_planning.out
+++ b/src/test/regress/expected/multi_large_table_join_planning.out
@@ -7,12 +7,12 @@
 -- executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 10
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ t
 (1 row)
 
 BEGIN;
diff --git a/src/test/regress/expected/multi_large_table_join_planning_0.out b/src/test/regress/expected/multi_large_table_join_planning_0.out
index 569e3acc2..d07eaa9a9 100644
--- a/src/test/regress/expected/multi_large_table_join_planning_0.out
+++ b/src/test/regress/expected/multi_large_table_join_planning_0.out
@@ -7,12 +7,12 @@
 -- executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 9
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ f
 (1 row)
 
 BEGIN;
diff --git a/src/test/regress/expected/multi_large_table_task_assignment.out b/src/test/regress/expected/multi_large_table_task_assignment.out
index 8eaf83f14..5405038e6 100644
--- a/src/test/regress/expected/multi_large_table_task_assignment.out
+++ b/src/test/regress/expected/multi_large_table_task_assignment.out
@@ -6,12 +6,12 @@
 -- from a sql task to its depended tasks. Note that we set the executor type to task
 -- tracker executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 10
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ t
 (1 row)
 
 BEGIN;
diff --git a/src/test/regress/expected/multi_large_table_task_assignment_0.out b/src/test/regress/expected/multi_large_table_task_assignment_0.out
index c752d3cb7..590d879a2 100644
--- a/src/test/regress/expected/multi_large_table_task_assignment_0.out
+++ b/src/test/regress/expected/multi_large_table_task_assignment_0.out
@@ -6,12 +6,12 @@
 -- from a sql task to its depended tasks. Note that we set the executor type to task
 -- tracker executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 9
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ f
 (1 row)
 
 BEGIN;
diff --git a/src/test/regress/expected/multi_null_minmax_value_pruning.out b/src/test/regress/expected/multi_null_minmax_value_pruning.out
index 8abddb3d3..a0e435821 100644
--- a/src/test/regress/expected/multi_null_minmax_value_pruning.out
+++ b/src/test/regress/expected/multi_null_minmax_value_pruning.out
@@ -4,12 +4,12 @@
 -- This test checks that we can handle null min/max values in shard statistics
 -- and that we don't partition or join prune shards that have null values.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 10
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ t
 (1 row)
 
 SET client_min_messages TO DEBUG2;
diff --git a/src/test/regress/expected/multi_null_minmax_value_pruning_0.out b/src/test/regress/expected/multi_null_minmax_value_pruning_0.out
index fd1ba6dc3..cebb9310e 100644
--- a/src/test/regress/expected/multi_null_minmax_value_pruning_0.out
+++ b/src/test/regress/expected/multi_null_minmax_value_pruning_0.out
@@ -4,12 +4,12 @@
 -- This test checks that we can handle null min/max values in shard statistics
 -- and that we don't partition or join prune shards that have null values.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 9
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ f
 (1 row)
 
 SET client_min_messages TO DEBUG2;
diff --git a/src/test/regress/expected/multi_task_assignment_policy.out b/src/test/regress/expected/multi_task_assignment_policy.out
index edae227c0..a8474de1d 100644
--- a/src/test/regress/expected/multi_task_assignment_policy.out
+++ b/src/test/regress/expected/multi_task_assignment_policy.out
@@ -2,12 +2,12 @@
 -- MULTI_TASK_ASSIGNMENT
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 10
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ t
 (1 row)
 
 SET citus.explain_distributed_queries TO off;
diff --git a/src/test/regress/expected/multi_task_assignment_policy_0.out b/src/test/regress/expected/multi_task_assignment_policy_0.out
index 642e05a6d..f68678ddf 100644
--- a/src/test/regress/expected/multi_task_assignment_policy_0.out
+++ b/src/test/regress/expected/multi_task_assignment_policy_0.out
@@ -2,12 +2,12 @@
 -- MULTI_TASK_ASSIGNMENT
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
- major_version 
----------------
- 9
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
+ version_above_nine 
+--------------------
+ f
 (1 row)
 
 SET citus.explain_distributed_queries TO off;
diff --git a/src/test/regress/sql/multi_create_table_new_features.sql b/src/test/regress/sql/multi_create_table_new_features.sql
index 7e5676021..11e09e9ca 100644
--- a/src/test/regress/sql/multi_create_table_new_features.sql
+++ b/src/test/regress/sql/multi_create_table_new_features.sql
@@ -2,9 +2,9 @@
 -- MULTI_CREATE_TABLE_NEW_FEATURES
 --
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 -- Verify that the GENERATED ... AS IDENTITY feature in PostgreSQL 10
 -- is forbidden in distributed tables.
diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql
index 07aefa97b..1bf135afc 100644
--- a/src/test/regress/sql/multi_explain.sql
+++ b/src/test/regress/sql/multi_explain.sql
@@ -4,8 +4,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
 
--- print major version to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
+-- print whether we're using version > 9 to make version-specific tests clear
+SHOW server_version \gset
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 \a\t
 
diff --git a/src/test/regress/sql/multi_large_table_join_planning.sql b/src/test/regress/sql/multi_large_table_join_planning.sql
index d8da3454f..2532ad1fb 100644
--- a/src/test/regress/sql/multi_large_table_join_planning.sql
+++ b/src/test/regress/sql/multi_large_table_join_planning.sql
@@ -10,9 +10,9 @@
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 BEGIN;
 SET client_min_messages TO DEBUG4;
diff --git a/src/test/regress/sql/multi_large_table_task_assignment.sql b/src/test/regress/sql/multi_large_table_task_assignment.sql
index 9a69189fa..229a606ea 100644
--- a/src/test/regress/sql/multi_large_table_task_assignment.sql
+++ b/src/test/regress/sql/multi_large_table_task_assignment.sql
@@ -9,9 +9,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 
 BEGIN;
diff --git a/src/test/regress/sql/multi_null_minmax_value_pruning.sql b/src/test/regress/sql/multi_null_minmax_value_pruning.sql
index 03dbb77f1..dee0a712d 100644
--- a/src/test/regress/sql/multi_null_minmax_value_pruning.sql
+++ b/src/test/regress/sql/multi_null_minmax_value_pruning.sql
@@ -8,9 +8,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 SET client_min_messages TO DEBUG2;
 SET citus.explain_all_tasks TO on;
diff --git a/src/test/regress/sql/multi_task_assignment_policy.sql b/src/test/regress/sql/multi_task_assignment_policy.sql
index 74253d36e..a6be1e91a 100644
--- a/src/test/regress/sql/multi_task_assignment_policy.sql
+++ b/src/test/regress/sql/multi_task_assignment_policy.sql
@@ -5,9 +5,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 
 SET citus.explain_distributed_queries TO off;