diff --git a/src/test/regress/expected/multi_router_planner.out b/src/test/regress/expected/multi_router_planner.out
index 21393dcc9..e6053d972 100644
--- a/src/test/regress/expected/multi_router_planner.out
+++ b/src/test/regress/expected/multi_router_planner.out
@@ -1530,6 +1530,11 @@ SELECT * FROM mv_articles_hash;
  41 |         1 | aznavour     |      11814
 (5 rows)
 
+DROP MATERIALIZED VIEW mv_articles_hash;
+DEBUG:  drop auto-cascades to type mv_articles_hash
+DEBUG:  drop auto-cascades to type mv_articles_hash[]
+DEBUG:  drop auto-cascades to rule _RETURN on materialized view mv_articles_hash
+DEBUG:  EventTriggerInvoke 16727
 CREATE MATERIALIZED VIEW mv_articles_hash_error AS
 	SELECT * FROM articles_hash WHERE author_id in (1,2);
 NOTICE:  cannot use shard pruning with ANY/ALL (array expression)
@@ -1537,13 +1542,6 @@ HINT:  Consider rewriting the expression with OR/AND clauses.
 NOTICE:  cannot use shard pruning with ANY/ALL (array expression)
 HINT:  Consider rewriting the expression with OR/AND clauses.
 ERROR:  cannot create temporary table within security-restricted operation
--- materialized views with (NO DATA) is still not supported
-CREATE MATERIALIZED VIEW mv_articles_hash AS
-	SELECT * FROM articles_hash WHERE author_id = 1 WITH NO DATA;
-DEBUG:  predicate pruning for shardId 840001
-DEBUG:  Creating router plan
-DEBUG:  Plan is router executable
-ERROR:  scan directions other than forward scans are unsupported
 	
 -- router planner/executor is disabled for task-tracker executor
 -- following query is router plannable, but router planner is disabled
@@ -1583,7 +1581,6 @@ DEBUG:  predicate pruning for shardId 840001
 SET client_min_messages to 'NOTICE';
 DROP FUNCTION author_articles_max_id();
 DROP FUNCTION author_articles_id_word_count();
-DROP MATERIALIZED VIEW mv_articles_hash;
 DROP TABLE articles_hash;
 DROP TABLE articles_single_shard_hash;
 DROP TABLE authors_hash;
diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql
index 7828ff72b..c84dbee5b 100644
--- a/src/test/regress/sql/multi_router_planner.sql
+++ b/src/test/regress/sql/multi_router_planner.sql
@@ -654,12 +654,10 @@ CREATE MATERIALIZED VIEW mv_articles_hash AS
 
 SELECT * FROM mv_articles_hash;
 
+DROP MATERIALIZED VIEW mv_articles_hash;
+
 CREATE MATERIALIZED VIEW mv_articles_hash_error AS
 	SELECT * FROM articles_hash WHERE author_id in (1,2);
-
--- materialized views with (NO DATA) is still not supported
-CREATE MATERIALIZED VIEW mv_articles_hash AS
-	SELECT * FROM articles_hash WHERE author_id = 1 WITH NO DATA;
 	
 -- router planner/executor is disabled for task-tracker executor
 -- following query is router plannable, but router planner is disabled
@@ -681,7 +679,6 @@ SET client_min_messages to 'NOTICE';
 DROP FUNCTION author_articles_max_id();
 DROP FUNCTION author_articles_id_word_count();
 
-DROP MATERIALIZED VIEW mv_articles_hash;
 DROP TABLE articles_hash;
 DROP TABLE articles_single_shard_hash;
 DROP TABLE authors_hash;