diff --git a/dbcon/mysql/install_mcs_mysql.sh.in b/dbcon/mysql/install_mcs_mysql.sh.in
index 6632c7630..1bd6e371a 100755
--- a/dbcon/mysql/install_mcs_mysql.sh.in
+++ b/dbcon/mysql/install_mcs_mysql.sh.in
@@ -110,10 +110,7 @@ CREATE TABLE IF NOT EXISTS infinidb_querystats.priority
 insert ignore into infinidb_querystats.priority values ('High', 100),('Medium', 66), ('Low', 33);
 EOD
 
-$MDB <@ENGINE_SUPPORTDIR@/syscatalog_mysql.sql 2>/dev/null
 $MDB <@ENGINE_SUPPORTDIR@/calsetuserpriority.sql 2>/dev/null
 $MDB <@ENGINE_SUPPORTDIR@/calremoveuserpriority.sql 2>/dev/null
 $MDB <@ENGINE_SUPPORTDIR@/calshowprocesslist.sql 2>/dev/null
 $MDB <@ENGINE_SUPPORTDIR@/columnstore_info.sql 2>/dev/null
-
-
diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 8744e9478..c400410fb 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -275,6 +275,10 @@ Continue to install the engine though. \
 Please resolve the issues and run necessary scripts manually."
 fi
 
+# Create syscat tables that uses COLUMNSTORE engine after MDB
+# loads the engine plugin .so up.
+$MDB <@ENGINE_SUPPORTDIR@/syscatalog_mysql.sql 2>/dev/null
+
 if [ -z "$MCS_USE_S3_STORAGE" ]; then
   MCS_USE_S3_STORAGE="$(find_env_var "MCS_USE_S3_STORAGE")"
   MCS_S3_BUCKET="$(find_env_var "MCS_S3_BUCKET")"