diff --git a/contrib/babelfishpg_tsql/src/pl_handler.c b/contrib/babelfishpg_tsql/src/pl_handler.c
index c5976b45d8..3be13c09e5 100644
--- a/contrib/babelfishpg_tsql/src/pl_handler.c
+++ b/contrib/babelfishpg_tsql/src/pl_handler.c
@@ -1563,7 +1563,7 @@ static void modifyColumnEntries(List* targetList, forjson_table **tableInfoArr,
 				if(handleForJsonAuto(castNode(Query, sl->subselect), tableInfoArr, numTables)) {
 					CoerceViaIO *iocoerce = makeNode(CoerceViaIO);
 					iocoerce->arg = (Expr*) sl;
-					iocoerce->resulttype = T_JsonArrayQueryConstructor;
+					iocoerce->resulttype = TypenameGetTypid("json");
 					iocoerce->resultcollid = 0;
 					iocoerce->coerceformat = COERCE_EXPLICIT_CAST;
 					buildJsonEntry(1, "temp", te);
diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule
index aaf95d2688..8749f00da6 100644
--- a/test/JDBC/jdbc_schedule
+++ b/test/JDBC/jdbc_schedule
@@ -487,9 +487,6 @@ ignore#!#pgr_select
 ignore#!#pgr_zzz_clean_up
 
 # Ignoring some test temporarily to get clean tests
-ignore#!#forjsonauto-vu-prepare
-ignore#!#forjsonauto-vu-verify
-ignore#!#forjsonauto-vu-cleanup
 ignore#!#BABEL-3292
 ignore#!#BABEL-3512
 ignore#!#BABEL-4046-vu-prepare
diff --git a/test/JDBC/upgrade/16_5/schedule b/test/JDBC/upgrade/16_5/schedule
index efd5bd6867..056fac369a 100644
--- a/test/JDBC/upgrade/16_5/schedule
+++ b/test/JDBC/upgrade/16_5/schedule
@@ -220,7 +220,7 @@ forjson
 forjson-datatypes
 forjson-subquery
 forjson-nesting
-# forjsonauto - TODO JIRA - BABEL-5398
+forjsonauto
 format
 format-dep
 forxml
diff --git a/test/JDBC/upgrade/latest/schedule b/test/JDBC/upgrade/latest/schedule
index be0c4ee26d..cef7549c2f 100644
--- a/test/JDBC/upgrade/latest/schedule
+++ b/test/JDBC/upgrade/latest/schedule
@@ -220,7 +220,7 @@ forjson
 forjson-datatypes
 forjson-subquery
 forjson-nesting
-# forjsonauto - TODO JIRA - BABEL-5398
+forjsonauto
 format
 format-dep
 forxml