diff --git a/src/backend/distributed/sql/udfs/citus_nodes/10.0-1.sql b/src/backend/distributed/sql/udfs/citus_nodes/10.0-1.sql
index cbd02eb60..bf33c17b2 100644
--- a/src/backend/distributed/sql/udfs/citus_nodes/10.0-1.sql
+++ b/src/backend/distributed/sql/udfs/citus_nodes/10.0-1.sql
@@ -36,6 +36,8 @@ SELECT
 FROM
   pg_dist_node n,
   citus_node_disk_space_stats(n.nodename, n.nodeport) ds
+WHERE
+  n.isactive AND nodecluster = current_setting('citus.cluster_name')
 ORDER BY
   groupid;
 
diff --git a/src/backend/distributed/sql/udfs/citus_nodes/latest.sql b/src/backend/distributed/sql/udfs/citus_nodes/latest.sql
index cbd02eb60..bf33c17b2 100644
--- a/src/backend/distributed/sql/udfs/citus_nodes/latest.sql
+++ b/src/backend/distributed/sql/udfs/citus_nodes/latest.sql
@@ -36,6 +36,8 @@ SELECT
 FROM
   pg_dist_node n,
   citus_node_disk_space_stats(n.nodename, n.nodeport) ds
+WHERE
+  n.isactive AND nodecluster = current_setting('citus.cluster_name')
 ORDER BY
   groupid;
 
diff --git a/src/test/regress/expected/multi_cluster_management.out b/src/test/regress/expected/multi_cluster_management.out
index 78acc6dc0..f37c6058f 100644
--- a/src/test/regress/expected/multi_cluster_management.out
+++ b/src/test/regress/expected/multi_cluster_management.out
@@ -998,3 +998,57 @@ WHERE logicalrelid = 'test_dist_non_colocated'::regclass GROUP BY nodeport ORDER
 SELECT * from master_set_node_property('localhost', :worker_2_port, 'bogusproperty', false);
 ERROR:  only the 'shouldhaveshards' property can be set using this function
 DROP TABLE test_dist, test_ref, test_dist_colocated, test_dist_non_colocated;
+SELECT master_remove_node('localhost', 8887);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 8888);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9992);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9994);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9995);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9996);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9997);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT master_remove_node('localhost', 9998);
+ master_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT count(*) FROM pg_dist_node;
+ count
+---------------------------------------------------------------------
+     2
+(1 row)
+
diff --git a/src/test/regress/expected/multi_mx_create_table.out b/src/test/regress/expected/multi_mx_create_table.out
index 9230beda0..dcb9871c0 100644
--- a/src/test/regress/expected/multi_mx_create_table.out
+++ b/src/test/regress/expected/multi_mx_create_table.out
@@ -515,6 +515,16 @@ ORDER BY "Name"::text;
  supplier_mx                                            | reference        | <none>              |           1 | postgres
 (23 rows)
 
+-- test the citus nodes view
+SELECT "Host", "Port", "Node Type", "Distributed Table Shards", "Reference Tables"
+FROM citus_nodes
+ORDER BY 1,2;
+   Host    | Port  | Node Type | Distributed Table Shards | Reference Tables
+---------------------------------------------------------------------
+ localhost | 57637 | worker    |                       55 |                4
+ localhost | 57638 | worker    |                       52 |                4
+(2 rows)
+
 \c - - - :worker_1_port
 SELECT "Name", "Citus Table Type", "Distribution Column", "Shard Count", "Owner"
 FROM citus_tables
@@ -546,3 +556,12 @@ ORDER BY "Name"::text;
  supplier_mx                                            | reference        | <none>              |           1 | postgres
 (23 rows)
 
+SELECT "Host", "Port", "Node Type", "Distributed Table Shards", "Reference Tables"
+FROM citus_nodes
+ORDER BY 1,2;
+   Host    | Port  | Node Type | Distributed Table Shards | Reference Tables
+---------------------------------------------------------------------
+ localhost | 57637 | worker    |                       55 |                4
+ localhost | 57638 | worker    |                       52 |                4
+(2 rows)
+
diff --git a/src/test/regress/expected/multi_size_queries.out b/src/test/regress/expected/multi_size_queries.out
index b99e897c6..d3e4fa7e3 100644
--- a/src/test/regress/expected/multi_size_queries.out
+++ b/src/test/regress/expected/multi_size_queries.out
@@ -131,6 +131,13 @@ SELECT citus_total_relation_size('supplier');
                     458752
 (1 row)
 
+-- mainly to get line coverage
+SELECT citus_database_size() > 0;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
 -- Test inside the transaction
 BEGIN;
 ALTER TABLE supplier ALTER COLUMN s_suppkey SET NOT NULL;
diff --git a/src/test/regress/expected/upgrade_list_citus_objects_0.out b/src/test/regress/expected/upgrade_list_citus_objects_0.out
index 97d247f1f..30d5e786f 100644
--- a/src/test/regress/expected/upgrade_list_citus_objects_0.out
+++ b/src/test/regress/expected/upgrade_list_citus_objects_0.out
@@ -219,5 +219,5 @@ ORDER BY 1;
  view citus_tables
  view citus_worker_stat_activity
  view pg_dist_shard_placement
-(201 rows)
+(203 rows)
 
diff --git a/src/test/regress/sql/multi_cluster_management.sql b/src/test/regress/sql/multi_cluster_management.sql
index 303a37a6e..2443880c7 100644
--- a/src/test/regress/sql/multi_cluster_management.sql
+++ b/src/test/regress/sql/multi_cluster_management.sql
@@ -415,3 +415,13 @@ WHERE logicalrelid = 'test_dist_non_colocated'::regclass GROUP BY nodeport ORDER
 SELECT * from master_set_node_property('localhost', :worker_2_port, 'bogusproperty', false);
 
 DROP TABLE test_dist, test_ref, test_dist_colocated, test_dist_non_colocated;
+
+SELECT master_remove_node('localhost', 8887);
+SELECT master_remove_node('localhost', 8888);
+SELECT master_remove_node('localhost', 9992);
+SELECT master_remove_node('localhost', 9994);
+SELECT master_remove_node('localhost', 9995);
+SELECT master_remove_node('localhost', 9996);
+SELECT master_remove_node('localhost', 9997);
+SELECT master_remove_node('localhost', 9998);
+SELECT count(*) FROM pg_dist_node;
diff --git a/src/test/regress/sql/multi_mx_create_table.sql b/src/test/regress/sql/multi_mx_create_table.sql
index 82fdb1d57..b5ee018fe 100644
--- a/src/test/regress/sql/multi_mx_create_table.sql
+++ b/src/test/regress/sql/multi_mx_create_table.sql
@@ -433,10 +433,17 @@ SELECT "Name", "Citus Table Type", "Distribution Column", "Shard Count", "Owner"
 FROM citus_tables
 ORDER BY "Name"::text;
 
+-- test the citus nodes view
+SELECT "Host", "Port", "Node Type", "Distributed Table Shards", "Reference Tables"
+FROM citus_nodes
+ORDER BY 1,2;
+
 \c - - - :worker_1_port
 
 SELECT "Name", "Citus Table Type", "Distribution Column", "Shard Count", "Owner"
 FROM citus_tables
 ORDER BY "Name"::text;
 
-
+SELECT "Host", "Port", "Node Type", "Distributed Table Shards", "Reference Tables"
+FROM citus_nodes
+ORDER BY 1,2;
diff --git a/src/test/regress/sql/multi_size_queries.sql b/src/test/regress/sql/multi_size_queries.sql
index 99ae6cef9..48485e431 100644
--- a/src/test/regress/sql/multi_size_queries.sql
+++ b/src/test/regress/sql/multi_size_queries.sql
@@ -60,6 +60,9 @@ SELECT citus_table_size('supplier');
 SELECT citus_relation_size('supplier');
 SELECT citus_total_relation_size('supplier');
 
+-- mainly to get line coverage
+SELECT citus_database_size() > 0;
+
 -- Test inside the transaction
 BEGIN;
 ALTER TABLE supplier ALTER COLUMN s_suppkey SET NOT NULL;