diff --git a/src/gausskernel/process/tcop/utility.cpp b/src/gausskernel/process/tcop/utility.cpp
index de24f87e935faa58fa0be3a87c0352dbbe30bcea..dfaa31c0a13808b3768652faac888996c52f860a 100644
--- a/src/gausskernel/process/tcop/utility.cpp
+++ b/src/gausskernel/process/tcop/utility.cpp
@@ -3795,12 +3795,12 @@ void standard_ProcessUtility(Node* parse_tree, const char* query_string, ParamLi
 
             switch (stmt->kind) {
                 case OBJECT_AGGREGATE:
-#ifdef PGXC
+#ifdef  ENABLE_MULTIPLE_NODES
                     if (!u_sess->attr.attr_common.IsInplaceUpgrade && !u_sess->exec_cxt.extension_is_valid)
                         ereport(ERROR,
                             (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                 errmsg("user defined aggregate is not yet supported.")));
-#endif /* PGXC */
+#endif /*  ENABLE_MULTIPLE_NODES */
                     DefineAggregate(stmt->defnames, stmt->args, stmt->oldstyle, stmt->definition);
                     break;
                 case OBJECT_OPERATOR:
@@ -8547,9 +8547,11 @@ void CheckObjectInBlackList(ObjectType obj_type, const char* query_string)
                 return;
             else
                 break;
+#ifdef ENABLE_MULTIPLE_NODES
         case OBJECT_AGGREGATE:
             tag = "AGGREGATE";
             break;
+#endif
         case OBJECT_OPERATOR:
             tag = "OPERATOR";
             break;
diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index e50af6a2839966f5405b2d7b4a7277637405f209..b67ecb9782b30e2768e06f422c0e61723ede6cf6 100644
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -126,12 +126,12 @@ create aggregate newavg2 (sfunc = int4pl,
 			  stype = int4,
 			  finalfunc = int2um,
 			  initcond = '0');
-ERROR:  user defined aggregate is not yet supported.
+ERROR:  function int2um(smallint) requires run-time type coercion
 -- left out basetype
 create aggregate newcnt1 (sfunc = int4inc,
 			  stype = int4,
 			  initcond = '0');
-ERROR:  user defined aggregate is not yet supported.
+ERROR:  aggregate input type must be specified
 --
 -- DROP INDEX
 -- missing index name
diff --git a/src/test/regress/expected/single_node_errors.out b/src/test/regress/expected/single_node_errors.out
index 497dc1fb32ecdf1e0f804a1a84b2858d68ed1610..299262e3587ad844e9d90db0b939f0d9d0367597 100644
--- a/src/test/regress/expected/single_node_errors.out
+++ b/src/test/regress/expected/single_node_errors.out
@@ -127,12 +127,12 @@ create aggregate newavg2 (sfunc = int4pl,
 			  stype = int4,
 			  finalfunc = int2um,
 			  initcond = '0');
-ERROR:  user defined aggregate is not yet supported.
+ERROR:  function int2um(smallint) requires run-time type coercion
 -- left out basetype
 create aggregate newcnt1 (sfunc = int4inc,
 			  stype = int4,
 			  initcond = '0');
-ERROR:  user defined aggregate is not yet supported.
+ERROR:  aggregate input type must be specified
 --
 -- DROP INDEX
 -- missing index name