diff --git a/.github/workflows/update-test.yaml b/.github/workflows/update-test.yaml
index 5f9835176e9..17d0eaec0dd 100644
--- a/.github/workflows/update-test.yaml
+++ b/.github/workflows/update-test.yaml
@@ -71,7 +71,7 @@ jobs:
 
     - name: Downgrade tests ${{ matrix.pg }}
       env:
-        TEST_VERSION: v7
+        TEST_VERSION: v9
       run: |
         DOWNGRADE_TO=$(grep '^downgrade_to_version = ' version.config | sed -e 's!^[^=]\+ = !!')
         PG_MAJOR=$(echo "${{ matrix.pg }}" | sed -e 's![.].*!!')
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f423bfdf8fa..04df912caec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,12 +29,14 @@ accidentally triggering the load of a previous DB version.**
 * #5499 Do not segfault on large histogram() parameters
 * #5497 Allow named time_bucket arguments in Cagg definition
 * #5500 Fix when no FROM clause in continuous aggregate definition
+* #5433 Fix join rte in CAggs with joins
 
 **Thanks**
 * @nikolaps for reporting an issue with the COPY fetcher
 * @S-imo-n for reporting the issue on Background Worker Scheduler crash
 * @kovetskiy and @DZDomi for reporting peformance regression in Realtime Continuous Aggregates
 * @geezhu for reporting issue on segfault in historgram()
+* @mwahlthuetter for reporting the issue with joins in CAggs
 
 ## 2.10.1 (2023-03-07)
 
diff --git a/scripts/test_updates_pg12.sh b/scripts/test_updates_pg12.sh
index 59110f421d8..6c7a55e4d8d 100755
--- a/scripts/test_updates_pg12.sh
+++ b/scripts/test_updates_pg12.sh
@@ -20,3 +20,4 @@ run_tests "$@" -v7 \
 run_tests "$@" -v8 \
           2.5.0-pg12 2.5.1-pg12 2.5.2-pg12 2.6.0-pg12 2.6.1-pg12 2.7.0-pg12 2.7.1-pg12 2.7.2-pg12 \
           2.8.0-pg12 2.8.1-pg12 2.9.0-pg12 2.9.1-pg12 2.9.2-pg12 2.9.3-pg12 2.10.0-pg12 2.10.1-pg12
+
diff --git a/scripts/test_updates_pg13.sh b/scripts/test_updates_pg13.sh
index 76189be0455..1003b5086c7 100755
--- a/scripts/test_updates_pg13.sh
+++ b/scripts/test_updates_pg13.sh
@@ -13,4 +13,6 @@ run_tests "$@" -v7 \
 run_tests "$@" -v8 \
           2.5.0-pg13 2.5.1-pg13 2.5.2-pg13 2.6.0-pg13 2.6.1-pg13 2.7.0-pg13 2.7.1-pg13 2.7.2-pg13 \
           2.8.0-pg13 2.8.1-pg13 2.9.0-pg13 2.9.1-pg13 2.9.2-pg13 2.9.3-pg13 2.10.0-pg13 2.10.1-pg13
+run_tests "$@" -v9 \
+          2.10.0-pg13 2.10.1-pg13
 
diff --git a/scripts/test_updates_pg14.sh b/scripts/test_updates_pg14.sh
index 5534f6252b6..27710536e3a 100755
--- a/scripts/test_updates_pg14.sh
+++ b/scripts/test_updates_pg14.sh
@@ -12,4 +12,5 @@ run_tests "$@" -v7 \
 run_tests "$@" -v8 \
           2.5.0-pg14 2.5.1-pg14 2.5.2-pg14 2.6.0-pg14 2.6.1-pg14 2.7.0-pg14 2.7.1-pg14 2.7.2-pg14 \
           2.8.0-pg14 2.8.1-pg14 2.9.0-pg14 2.9.1-pg14 2.9.2-pg14 2.9.3-pg14 2.10.0-pg14 2.10.1-pg14
-
+run_tests "$@" -v9 \
+          2.10.0-pg14 2.10.1-pg14
diff --git a/scripts/test_updates_pg15.sh b/scripts/test_updates_pg15.sh
index 256840769c2..41509c0c8b7 100755
--- a/scripts/test_updates_pg15.sh
+++ b/scripts/test_updates_pg15.sh
@@ -9,3 +9,5 @@ source ${SCRIPT_DIR}/test_functions.inc
 
 run_tests "$@" -v8 \
           2.9.0-pg15 2.9.1-pg15 2.9.2-pg15 2.9.3-pg15 2.10.0-pg15 2.10.1-pg15
+run_tests "$@" -v9 \
+          2.10.0-pg15 2.10.1-pg15
diff --git a/sql/updates/post-update.sql b/sql/updates/post-update.sql
index 141a8ce6046..90ce026db67 100644
--- a/sql/updates/post-update.sql
+++ b/sql/updates/post-update.sql
@@ -8,7 +8,7 @@ BEGIN
     SELECT extversion INTO ts_version FROM pg_extension WHERE extname = 'timescaledb';
     IF ts_version >= '2.7.0' THEN
             CREATE PROCEDURE _timescaledb_internal.post_update_cagg_try_repair(
-                cagg_view REGCLASS
+                cagg_view REGCLASS, force_rebuild boolean
             ) AS '@MODULE_PATHNAME@', 'ts_cagg_try_repair' LANGUAGE C;
     END IF;
     FOR vname, materialized_only IN select format('%I.%I', cagg.user_view_schema, cagg.user_view_name)::regclass, cagg.materialized_only from _timescaledb_catalog.continuous_agg cagg
@@ -26,7 +26,7 @@ BEGIN
             EXECUTE format('ALTER MATERIALIZED VIEW %s SET (timescaledb.materialized_only=%L) ', vname::text, materialized_only);
         ELSE
             SET log_error_verbosity TO VERBOSE;
-            CALL _timescaledb_internal.post_update_cagg_try_repair(vname);
+            CALL _timescaledb_internal.post_update_cagg_try_repair(vname, false);
         END IF;
     END LOOP;
     IF ts_version >= '2.7.0' THEN
@@ -36,6 +36,30 @@ BEGIN
 END
 $$;
 
+--Check for correct upgrade for the caggs with joins
+DO $$
+DECLARE
+  vname regclass;
+  ts_version TEXT;
+BEGIN
+    SELECT extversion INTO ts_version FROM pg_extension WHERE extname = 'timescaledb';
+    IF ts_version >= '2.10.0' THEN
+            CREATE PROCEDURE _timescaledb_internal.post_update_cagg_try_repair(
+                cagg_view REGCLASS, force_rebuild boolean
+            ) AS '@MODULE_PATHNAME@', 'ts_cagg_try_repair' LANGUAGE C;
+      FOR vname IN select format('%I.%I', cagg.user_view_schema, cagg.user_view_name)::regclass from _timescaledb_catalog.continuous_agg cagg
+        LOOP
+          SET log_error_verbosity TO VERBOSE;
+          CALL _timescaledb_internal.post_update_cagg_try_repair(vname, true);
+        END LOOP;
+    END IF;
+    IF ts_version >= '2.10.0' THEN
+            DROP PROCEDURE IF EXISTS _timescaledb_internal.post_update_cagg_try_repair;
+    END IF;
+    EXCEPTION WHEN OTHERS THEN RAISE;
+END
+$$;
+
 -- can only be dropped after views have been rebuilt
 DROP FUNCTION IF EXISTS _timescaledb_internal.cagg_watermark(oid);
 
diff --git a/test/sql/updates/cleanup.continuous_aggs.v9.sql b/test/sql/updates/cleanup.continuous_aggs.v9.sql
new file mode 100644
index 00000000000..6a67b94dab2
--- /dev/null
+++ b/test/sql/updates/cleanup.continuous_aggs.v9.sql
@@ -0,0 +1,9 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+DROP MATERIALIZED VIEW cagg_joins_upgrade_test_with_realtime;
+DROP MATERIALIZED VIEW cagg_joins_upgrade_test;
+
+DROP TABLE ht_cagg_joins CASCADE;
+DROP TABLE nt_cagg_joins CASCADE;
diff --git a/test/sql/updates/cleanup.v9.sql b/test/sql/updates/cleanup.v9.sql
new file mode 100644
index 00000000000..a4e817b73a2
--- /dev/null
+++ b/test/sql/updates/cleanup.v9.sql
@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir cleanup.v7.sql
+\ir cleanup.continuous_aggs.v9.sql
diff --git a/test/sql/updates/post.continuous_aggs.v9.sql b/test/sql/updates/post.continuous_aggs.v9.sql
new file mode 100644
index 00000000000..7a638792d27
--- /dev/null
+++ b/test/sql/updates/post.continuous_aggs.v9.sql
@@ -0,0 +1,7 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+SELECT * FROM cagg_joins_upgrade_test_with_realtime ORDER BY bucket;
+SELECT * FROM cagg_joins_upgrade_test ORDER BY bucket;
+
diff --git a/test/sql/updates/post.v9.sql b/test/sql/updates/post.v9.sql
new file mode 100644
index 00000000000..7b6029c70c4
--- /dev/null
+++ b/test/sql/updates/post.v9.sql
@@ -0,0 +1,5 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+--\ir post.v8.sql
\ No newline at end of file
diff --git a/test/sql/updates/setup.continuous_aggs.v9.sql b/test/sql/updates/setup.continuous_aggs.v9.sql
new file mode 100644
index 00000000000..67a012ecf26
--- /dev/null
+++ b/test/sql/updates/setup.continuous_aggs.v9.sql
@@ -0,0 +1,53 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+CREATE TABLE ht_cagg_joins(
+  day DATE NOT NULL,
+  city text NOT NULL,
+  temperature INT NOT NULL,
+device_id int NOT NULL);
+SELECT create_hypertable(
+  'ht_cagg_joins', 'day',
+  chunk_time_interval => INTERVAL '1 day'
+);
+INSERT INTO ht_cagg_joins (day, city, temperature, device_id) VALUES
+  ('2021-06-14', 'Moscow', 26,1),
+  ('2021-06-15', 'Moscow', 22,2),
+  ('2021-06-16', 'Moscow', 24,3),
+  ('2021-06-17', 'Moscow', 24,4),
+  ('2021-06-18', 'Moscow', 27,4),
+  ('2021-06-19', 'Moscow', 28,4),
+  ('2021-06-20', 'Moscow', 30,1),
+  ('2021-06-21', 'Moscow', 31,1),
+  ('2021-06-22', 'Moscow', 34,1),
+  ('2021-06-23', 'Moscow', 34,2),
+  ('2021-06-24', 'Moscow', 34,2),
+  ('2021-06-25', 'Moscow', 32,3),
+  ('2021-06-26', 'Moscow', 32,3),
+  ('2021-06-27', 'Moscow', 31,3);
+
+CREATE TABLE nt_cagg_joins ( device_id int not null, name text, location text);
+INSERT INTO nt_cagg_joins values (1, 'thermo_1', 'Moscow'), (2, 'thermo_2', 'Berlin'),(3, 'thermo_3', 'London'),(4, 'thermo_4', 'Stockholm');
+
+--Create a cagg with join between a hypertable and a normal table
+-- with equality condition on inner join type and realtime aggregation enabled
+CREATE MATERIALIZED VIEW cagg_joins_upgrade_test_with_realtime
+WITH (timescaledb.continuous, timescaledb.materialized_only = FALSE) AS
+SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
+   AVG(temperature),
+   name
+FROM ht_cagg_joins JOIN nt_cagg_joins
+ON ht_cagg_joins.device_id = nt_cagg_joins.device_id
+GROUP BY 1,3;
+
+--Create a cagg with join between a hypertable and a normal table
+-- with equality condition on inner join type and realtime aggregation disabled
+CREATE MATERIALIZED VIEW cagg_joins_upgrade_test
+WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
+SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
+   AVG(temperature),
+   name
+FROM ht_cagg_joins JOIN nt_cagg_joins
+ON ht_cagg_joins.device_id = nt_cagg_joins.device_id
+GROUP BY 1,3;
\ No newline at end of file
diff --git a/test/sql/updates/setup.v9.sql b/test/sql/updates/setup.v9.sql
new file mode 100644
index 00000000000..866420b2fc3
--- /dev/null
+++ b/test/sql/updates/setup.v9.sql
@@ -0,0 +1,6 @@
+-- This file and its contents are licensed under the Apache License 2.0.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-APACHE for a copy of the license.
+
+\ir setup.v8.sql
+\ir setup.continuous_aggs.v9.sql
diff --git a/tsl/src/continuous_aggs/create.c b/tsl/src/continuous_aggs/create.c
index b917732f00e..9ad2947f934 100644
--- a/tsl/src/continuous_aggs/create.c
+++ b/tsl/src/continuous_aggs/create.c
@@ -2509,6 +2509,9 @@ finalizequery_get_select_query(FinalizeQueryInfo *inp, List *matcollist,
 		ListCell *l;
 		foreach (l, inp->final_userquery->jointree->fromlist)
 		{
+			/*
+			 * In case of joins, update the rte with all the join related struct.
+			 */
 			Node *jtnode = (Node *) lfirst(l);
 			JoinExpr *join = NULL;
 			if (IsA(jtnode, JoinExpr))
@@ -2516,26 +2519,47 @@ finalizequery_get_select_query(FinalizeQueryInfo *inp, List *matcollist,
 				join = castNode(JoinExpr, jtnode);
 				RangeTblEntry *jrte = rt_fetch(join->rtindex, inp->final_userquery->rtable);
 				rte->joinaliasvars = jrte->joinaliasvars;
+				rte->eref = copyObject(jrte->eref);
+#if PG13_GE
+				rte->joinleftcols = jrte->joinleftcols;
+				rte->joinrightcols = jrte->joinrightcols;
+#endif
+#if PG14_GE
+				rte->join_using_alias = jrte->join_using_alias;
+#endif
+				rte->selectedCols = jrte->selectedCols;
 			}
 		}
 	}
 	else
+	{
 		rte = llast_node(RangeTblEntry, inp->final_userquery->rtable);
+		rte->eref->colnames = NIL;
+		rte->selectedCols = NULL;
+	}
+	if (rte->eref->colnames == NIL)
+	{
+		/*
+		 * We only need to do this for the case when there is no Join node in the query.
+		 * In the case of join, rte->eref is already populated by jrte->eref and hence the
+		 * relevant info, so need not to do this.
+		 */
+
+		/* Aliases for column names for the materialization table. */
+		foreach (lc, matcollist)
+		{
+			ColumnDef *cdef = (ColumnDef *) lfirst(lc);
+			rte->eref->colnames = lappend(rte->eref->colnames, makeString(cdef->colname));
+			rte->selectedCols = bms_add_member(rte->selectedCols,
+											   list_length(rte->eref->colnames) -
+												   FirstLowInvalidHeapAttributeNumber);
+		}
+	}
 	rte->relid = mattbladdress->objectId;
 	rte->rtekind = RTE_RELATION;
 	rte->relkind = RELKIND_RELATION;
 	rte->tablesample = NULL;
-	rte->eref->colnames = NIL;
-	rte->selectedCols = NULL;
-	/* Aliases for column names for the materialization table. */
-	foreach (lc, matcollist)
-	{
-		ColumnDef *cdef = (ColumnDef *) lfirst(lc);
-		rte->eref->colnames = lappend(rte->eref->colnames, makeString(cdef->colname));
-		rte->selectedCols =
-			bms_add_member(rte->selectedCols,
-						   list_length(rte->eref->colnames) - FirstLowInvalidHeapAttributeNumber);
-	}
+
 	rte->requiredPerms |= ACL_SELECT;
 	rte->insertedCols = NULL;
 	rte->updatedCols = NULL;
@@ -2544,7 +2568,7 @@ finalizequery_get_select_query(FinalizeQueryInfo *inp, List *matcollist,
 	foreach (lc, inp->final_seltlist)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(lc);
-		if (IsA(tle->expr, Var))
+		if (IsA(tle->expr, Var) && tle->resorigtbl == 0)
 		{
 			tle->resorigtbl = rte->relid;
 			tle->resorigcol = ((Var *) tle->expr)->varattno;
@@ -2553,7 +2577,9 @@ finalizequery_get_select_query(FinalizeQueryInfo *inp, List *matcollist,
 
 	CAGG_MAKEQUERY(final_selquery, inp->final_userquery);
 	final_selquery->hasAggs = !inp->finalized;
-	if (list_length(inp->final_userquery->jointree->fromlist) >= CONTINUOUS_AGG_MAX_JOIN_RELATIONS)
+	if (list_length(inp->final_userquery->jointree->fromlist) >=
+			CONTINUOUS_AGG_MAX_JOIN_RELATIONS ||
+		!IsA(linitial(inp->final_userquery->jointree->fromlist), RangeTblRef))
 	{
 		RangeTblRef *rtr;
 		final_selquery->rtable = list_make1(rte);
@@ -2971,7 +2997,7 @@ remove_old_and_new_rte_from_query(Query *query)
  * for errors and attempt to rebuild it if required.
  */
 static void
-cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht)
+cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht, bool force_rebuild)
 {
 	bool test_failed = false;
 	char *relname = agg->data.user_view_name.data;
@@ -2984,22 +3010,41 @@ cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht)
 	Relation user_view_rel = relation_open(user_view_oid, AccessShareLock);
 	Query *user_query = get_view_query(user_view_rel);
 	bool finalized = ContinuousAggIsFinalized(agg);
+	bool has_joins = false;
+	bool skip_rebuild = false;
 
 	/* Extract final query from user view query. */
 	Query *final_query = copyObject(user_query);
 	remove_old_and_new_rte_from_query(final_query);
-	if (!agg->data.materialized_only)
-	{
-		final_query = destroy_union_query(final_query);
-	}
 
-	if (finalized)
+	if (finalized && force_rebuild == false)
 	{
 		/* This continuous aggregate does not have partials, do not check for defects. */
 		relation_close(user_view_rel, NoLock);
 		return;
 	}
 
+	if (user_query->jointree && user_query->jointree->fromlist)
+	{
+		if ((list_length(user_query->jointree->fromlist) == CONTINUOUS_AGG_MAX_JOIN_RELATIONS) ||
+			(!IsA(linitial(user_query->jointree->fromlist), RangeTblRef)))
+			has_joins = true;
+	}
+	else if (final_query && final_query->rtable &&
+			 list_length(final_query->rtable) == CONTINUOUS_AGG_MAX_JOIN_RELATIONS)
+		has_joins = true;
+
+	if (!has_joins || !force_rebuild)
+		skip_rebuild = true;
+	if (skip_rebuild)
+	{
+		relation_close(user_view_rel, NoLock);
+		return;
+	}
+	if (!agg->data.materialized_only)
+	{
+		final_query = destroy_union_query(final_query);
+	}
 	FinalizeQueryInfo fqi;
 	MatTableColumnInfo mattblinfo;
 	ObjectAddress mataddress = {
@@ -3021,7 +3066,8 @@ cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht)
 	fqi.finalized = finalized;
 	finalizequery_init(&fqi, direct_query, &mattblinfo);
 
-	mattablecolumninfo_addinternal(&mattblinfo);
+	if (!finalized)
+		mattablecolumninfo_addinternal(&mattblinfo);
 
 	Query *view_query =
 		finalizequery_get_select_query(&fqi, mattblinfo.matcollist, &mataddress, relname);
@@ -3041,7 +3087,6 @@ cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht)
 		 * rebuild those views since the materialization table can not be queried correctly.
 		 */
 		test_failed = true;
-
 	/*
 	 * When calling StoreViewQuery the target list names of the query have to
 	 * match the view's tuple descriptor attribute names. But if a column of the continuous
@@ -3059,6 +3104,7 @@ cagg_rebuild_view_definition(ContinuousAgg *agg, Hypertable *mat_ht)
 		FormData_pg_attribute *attr = TupleDescAttr(desc, i);
 		view_tle = lfirst_node(TargetEntry, lc1);
 		user_tle = lfirst_node(TargetEntry, lc2);
+
 		if (view_tle->resjunk && user_tle->resjunk)
 			break;
 		else if (view_tle->resjunk || user_tle->resjunk)
@@ -3106,6 +3152,7 @@ tsl_cagg_try_repair(PG_FUNCTION_ARGS)
 {
 	Oid relid = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
 	char relkind = get_rel_relkind(relid);
+	bool force_rebuild = PG_ARGISNULL(1) ? false : PG_GETARG_BOOL(1);
 	ContinuousAgg *cagg = NULL;
 
 	if (RELKIND_VIEW == relkind)
@@ -3124,7 +3171,7 @@ tsl_cagg_try_repair(PG_FUNCTION_ARGS)
 	Hypertable *mat_ht = ts_hypertable_cache_get_entry_by_id(hcache, cagg->data.mat_hypertable_id);
 	Assert(mat_ht != NULL);
 
-	cagg_rebuild_view_definition(cagg, mat_ht);
+	cagg_rebuild_view_definition(cagg, mat_ht, force_rebuild);
 
 	ts_cache_release(hcache);
 
diff --git a/tsl/test/expected/cagg_joins-12.out b/tsl/test/expected/cagg_joins-12.out
index 9788dfed390..8ed51447785 100644
--- a/tsl/test/expected/cagg_joins-12.out
+++ b/tsl/test/expected/cagg_joins-12.out
@@ -62,7 +62,7 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    name
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket;
+GROUP BY name, 1;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_realtime"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
 \d+ conditions_summary_daily_realtime
@@ -93,6 +93,25 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(3)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+(14 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-06-30', 'Moscow', 28, 3);
 SELECT *
@@ -160,6 +179,26 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(4)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(15 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-07-01', 'Moscow', 28, 3);
 SELECT *
@@ -197,9 +236,30 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    devices.device_id AS thermo_id
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket, thermo_id;
+GROUP BY name, 1, thermo_id;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   | thermo_id 
+------------+---------------------+-----+-----+----------+-----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1 |         1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2 |         2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3 |         3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4 |         4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4 |         4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4 |         4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1 |         1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1 |         1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1 |         1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3 |         3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_reorder
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -212,6 +272,27 @@ WHERE conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -223,6 +304,27 @@ FROM conditions JOIN devices ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -233,6 +335,10 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
 FROM devices JOIN conditions ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 ERROR:  time bucket function must reference a hypertable dimension column
+SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bucket;
+ERROR:  relation "conditions_summary_daily_2_reorder" does not exist
+LINE 1: SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bu...
+                      ^
 CREATE MATERIALIZED VIEW conditions_summary_daily_3
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -244,6 +350,10 @@ FROM devices JOIN conditions USING (device_id)
 GROUP BY name, bucket;
 ERROR:  invalid continuous aggregate view
 DETAIL:  joins with using clause in continuous aggregate definition work for Postgres versions 13 and above
+SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+ERROR:  relation "conditions_summary_daily_3" does not exist
+LINE 1: SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+                      ^
 CREATE MATERIALIZED VIEW conditions_summary_daily_3_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -255,6 +365,10 @@ FROM conditions JOIN devices USING (device_id)
 GROUP BY name, bucket;
 ERROR:  invalid continuous aggregate view
 DETAIL:  joins with using clause in continuous aggregate definition work for Postgres versions 13 and above
+SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bucket;
+ERROR:  relation "conditions_summary_daily_3_reorder" does not exist
+LINE 1: SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bu...
+                      ^
 --Error out for old format cagg definition
 CREATE MATERIALIZED VIEW conditions_summary_daily_cagg
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE, timescaledb.finalized = FALSE) AS
diff --git a/tsl/test/expected/cagg_joins-13.out b/tsl/test/expected/cagg_joins-13.out
index f1dfbcc076f..53f2d56d77d 100644
--- a/tsl/test/expected/cagg_joins-13.out
+++ b/tsl/test/expected/cagg_joins-13.out
@@ -62,7 +62,7 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    name
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket;
+GROUP BY name, 1;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_realtime"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
 \d+ conditions_summary_daily_realtime
@@ -93,6 +93,25 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(3)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+(14 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-06-30', 'Moscow', 28, 3);
 SELECT *
@@ -160,6 +179,26 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(4)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(15 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-07-01', 'Moscow', 28, 3);
 SELECT *
@@ -197,9 +236,30 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    devices.device_id AS thermo_id
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket, thermo_id;
+GROUP BY name, 1, thermo_id;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   | thermo_id 
+------------+---------------------+-----+-----+----------+-----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1 |         1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2 |         2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3 |         3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4 |         4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4 |         4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4 |         4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1 |         1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1 |         1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1 |         1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3 |         3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_reorder
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -212,6 +272,27 @@ WHERE conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -223,6 +304,27 @@ FROM conditions JOIN devices ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -234,6 +336,27 @@ FROM devices JOIN conditions ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -245,6 +368,27 @@ FROM devices JOIN conditions USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -256,6 +400,27 @@ FROM conditions JOIN devices USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 --Error out for old format cagg definition
 CREATE MATERIALIZED VIEW conditions_summary_daily_cagg
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE, timescaledb.finalized = FALSE) AS
diff --git a/tsl/test/expected/cagg_joins-14.out b/tsl/test/expected/cagg_joins-14.out
index f1dfbcc076f..53f2d56d77d 100644
--- a/tsl/test/expected/cagg_joins-14.out
+++ b/tsl/test/expected/cagg_joins-14.out
@@ -62,7 +62,7 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    name
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket;
+GROUP BY name, 1;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_realtime"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
 \d+ conditions_summary_daily_realtime
@@ -93,6 +93,25 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(3)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+(14 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-06-30', 'Moscow', 28, 3);
 SELECT *
@@ -160,6 +179,26 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(4)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(15 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-07-01', 'Moscow', 28, 3);
 SELECT *
@@ -197,9 +236,30 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    devices.device_id AS thermo_id
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket, thermo_id;
+GROUP BY name, 1, thermo_id;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   | thermo_id 
+------------+---------------------+-----+-----+----------+-----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1 |         1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2 |         2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3 |         3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4 |         4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4 |         4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4 |         4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1 |         1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1 |         1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1 |         1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3 |         3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_reorder
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -212,6 +272,27 @@ WHERE conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -223,6 +304,27 @@ FROM conditions JOIN devices ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -234,6 +336,27 @@ FROM devices JOIN conditions ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -245,6 +368,27 @@ FROM devices JOIN conditions USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -256,6 +400,27 @@ FROM conditions JOIN devices USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 --Error out for old format cagg definition
 CREATE MATERIALIZED VIEW conditions_summary_daily_cagg
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE, timescaledb.finalized = FALSE) AS
diff --git a/tsl/test/expected/cagg_joins-15.out b/tsl/test/expected/cagg_joins-15.out
index f1dfbcc076f..53f2d56d77d 100644
--- a/tsl/test/expected/cagg_joins-15.out
+++ b/tsl/test/expected/cagg_joins-15.out
@@ -62,7 +62,7 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    name
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket;
+GROUP BY name, 1;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_realtime"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
 \d+ conditions_summary_daily_realtime
@@ -93,6 +93,25 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(3)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+(14 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-06-30', 'Moscow', 28, 3);
 SELECT *
@@ -160,6 +179,26 @@ UNION ALL
   WHERE conditions.device_id = devices.device_id AND conditions.day >= COALESCE(_timescaledb_internal.to_date(_timescaledb_internal.cagg_watermark(4)), '-infinity'::date)
   GROUP BY devices.name, (time_bucket('@ 1 day'::interval, conditions.day));
 
+SELECT * FROM conditions_summary_daily_realtime_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(15 rows)
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-07-01', 'Moscow', 28, 3);
 SELECT *
@@ -197,9 +236,30 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    devices.device_id AS thermo_id
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket, thermo_id;
+GROUP BY name, 1, thermo_id;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   | thermo_id 
+------------+---------------------+-----+-----+----------+-----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1 |         1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2 |         2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3 |         3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4 |         4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4 |         4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4 |         4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1 |         1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1 |         1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1 |         1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2 |         2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3 |         3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3 |         3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3 |         3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_reorder
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -212,6 +272,27 @@ WHERE conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -223,6 +304,27 @@ FROM conditions JOIN devices ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -234,6 +336,27 @@ FROM devices JOIN conditions ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_2_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -245,6 +368,27 @@ FROM devices JOIN conditions USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -256,6 +400,27 @@ FROM conditions JOIN devices USING (device_id)
 GROUP BY name, bucket;
 NOTICE:  refreshing continuous aggregate "conditions_summary_daily_3_reorder"
 HINT:  Use WITH NO DATA if you do not want to refresh the continuous aggregate on creation.
+SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bucket;
+   bucket   |         avg         | max | min |   name   
+------------+---------------------+-----+-----+----------
+ 06-14-2021 | 26.0000000000000000 |  26 |  26 | thermo_1
+ 06-15-2021 | 22.0000000000000000 |  22 |  22 | thermo_2
+ 06-16-2021 | 24.0000000000000000 |  24 |  24 | thermo_3
+ 06-17-2021 | 24.0000000000000000 |  24 |  24 | thermo_4
+ 06-18-2021 | 27.0000000000000000 |  27 |  27 | thermo_4
+ 06-19-2021 | 28.0000000000000000 |  28 |  28 | thermo_4
+ 06-20-2021 | 30.0000000000000000 |  30 |  30 | thermo_1
+ 06-21-2021 | 31.0000000000000000 |  31 |  31 | thermo_1
+ 06-22-2021 | 34.0000000000000000 |  34 |  34 | thermo_1
+ 06-23-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-24-2021 | 34.0000000000000000 |  34 |  34 | thermo_2
+ 06-25-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-26-2021 | 32.0000000000000000 |  32 |  32 | thermo_3
+ 06-27-2021 | 31.0000000000000000 |  31 |  31 | thermo_3
+ 06-30-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+ 07-01-2021 | 28.0000000000000000 |  28 |  28 | thermo_3
+(16 rows)
+
 --Error out for old format cagg definition
 CREATE MATERIALIZED VIEW conditions_summary_daily_cagg
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE, timescaledb.finalized = FALSE) AS
diff --git a/tsl/test/sql/cagg_joins.sql.in b/tsl/test/sql/cagg_joins.sql.in
index 0b5dd345676..b6af5c31cc5 100644
--- a/tsl/test/sql/cagg_joins.sql.in
+++ b/tsl/test/sql/cagg_joins.sql.in
@@ -53,10 +53,12 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    name
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket;
+GROUP BY name, 1;
 
 \d+ conditions_summary_daily_realtime
 
+SELECT * FROM conditions_summary_daily_realtime ORDER BY bucket;
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-06-30', 'Moscow', 28, 3);
 
@@ -81,6 +83,8 @@ GROUP BY name, bucket;
 
 \d+ conditions_summary_daily_realtime_reorder
 
+SELECT * FROM conditions_summary_daily_realtime_reorder ORDER BY bucket;
+
 INSERT INTO conditions (day, city, temperature, device_id) VALUES
   ('2021-07-01', 'Moscow', 28, 3);
 
@@ -100,7 +104,9 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
    devices.device_id AS thermo_id
 FROM conditions, devices
 WHERE conditions.device_id = devices.device_id
-GROUP BY name, bucket, thermo_id;
+GROUP BY name, 1, thermo_id;
+
+SELECT * FROM conditions_summary_daily ORDER BY bucket;
 
 CREATE MATERIALIZED VIEW conditions_summary_daily_reorder
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE) AS
@@ -113,6 +119,8 @@ FROM devices, conditions
 WHERE conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 
+SELECT * FROM conditions_summary_daily_reorder ORDER BY bucket;
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -123,6 +131,8 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
 FROM conditions JOIN devices ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 
+SELECT * FROM conditions_summary_daily_2 ORDER BY bucket;
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_2_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -133,6 +143,8 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
 FROM devices JOIN conditions ON conditions.device_id = devices.device_id
 GROUP BY name, bucket;
 
+SELECT * FROM conditions_summary_daily_2_reorder ORDER BY bucket;
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -143,6 +155,8 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
 FROM devices JOIN conditions USING (device_id)
 GROUP BY name, bucket;
 
+SELECT * FROM conditions_summary_daily_3 ORDER BY bucket;
+
 CREATE MATERIALIZED VIEW conditions_summary_daily_3_reorder
 WITH (timescaledb.continuous) AS
 SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
@@ -153,6 +167,8 @@ SELECT time_bucket(INTERVAL '1 day', day) AS bucket,
 FROM conditions JOIN devices USING (device_id)
 GROUP BY name, bucket;
 
+SELECT * FROM conditions_summary_daily_3_reorder ORDER BY bucket;
+
 --Error out for old format cagg definition
 CREATE MATERIALIZED VIEW conditions_summary_daily_cagg
 WITH (timescaledb.continuous, timescaledb.materialized_only = TRUE, timescaledb.finalized = FALSE) AS