diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index cb3d8106de18164d90d68af5e2c5dcf8cf6144f3..9b4863fdb6b17372e9c153776219837b830a3646 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -1809,7 +1809,6 @@ heap_create_with_catalog(const char *relname,
 		switch (relkind)
 		{
 			case RELKIND_RELATION:
-				// GPDB_93_MERGE_FIXME: What about MATVIEW?
 				break;
 			case RELKIND_INDEX:
 				subtyp = "INDEX";
@@ -1820,6 +1819,9 @@ heap_create_with_catalog(const char *relname,
 			case RELKIND_VIEW:
 				subtyp = "VIEW";
 				break;
+			case RELKIND_MATVIEW:
+				subtyp = "MATVIEW";
+				break;
 			default:
 				doIt = false;
 		}
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 1c68a2b63adec44950fe9ad38ce8dc54d8b08749..fa355a33d3f7b1cce965375d854cc977482756a2 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -150,6 +150,8 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
 	int			save_sec_context;
 	int			save_nestlevel;
 
+	/* MATERIALIZED_VIEW_FIXME: Refresh MatView is not MPP-fied. */
+
 	/* Determine strength of lock needed. */
 	concurrent = stmt->concurrent;
 	lockmode = concurrent ? ExclusiveLock : AccessExclusiveLock;
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 19c9fe281d13c6aa71480657245fe02ca65e9c65..0e974896b3ea34db3ecd26370bf70f86ccb18e45 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -3236,6 +3236,10 @@ transformCreateTableAsStmt(ParseState *pstate, CreateTableAsStmt *stmt)
 	/* additional work needed for CREATE MATERIALIZED VIEW */
 	if (stmt->relkind == OBJECT_MATVIEW)
 	{
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("materialized view is not supported on greenplum")));
+
 		/*
 		 * Prohibit a data-modifying CTE in the query used to create a
 		 * materialized view. It's not sufficiently clear what the user would
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 12485e3e1c63eeaa88375bb6eeeaf460e0a10823..a86c232fabcbb5a86f8cc8e4c30cd4fe1887dcd2 100755
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -110,10 +110,7 @@ test: namespace
 # ----------
 test: privileges security_label collate lock replica_identity
 
-# GPDB_93_MERGE_FIXME: Materialized views have not been "MPP-ified", and don't
-# currently work. Disable test, until it's fixed. (If they still don't work when
-# we make a release, we should add a check in code, to throw a proper "not
-# supported" error message.)
+# MATERIALIZED_VIEW_FIXME : matview is not supported on greenplum. Enable the test when the feature is ready.
 #test: matview
 
 # ----------
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index a417f94faf4f52ebeb8f34cf480771971bd98672..64150f359f4eb7730229bae02fe176ce0206191d 100755
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -98,7 +98,8 @@ ignore: prepared_xacts
 test: privileges
 test: security_label
 test: collate
-test: matview
+# MATERIALIZED_VIEW_FIXME : matview is not supported on greenplum. Enable the test when the feature is ready.
+#test: matview
 test: lock
 test: replica_identity
 test: alter_generic