diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
index 883fd9c4c04..93cc3e5a31a 100644
--- a/src/NHibernate.Test/NHibernate.Test.csproj
+++ b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -65,7 +65,7 @@
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.5.2" />
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
     <PackageReference Include="Npgsql" Version="6.0.6" />
     <PackageReference Include="MySql.Data" Version="8.0.27" />
   </ItemGroup>
diff --git a/src/NHibernate/Dialect/FirebirdDialect.cs b/src/NHibernate/Dialect/FirebirdDialect.cs
index 8134ef31324..66304d6de5c 100644
--- a/src/NHibernate/Dialect/FirebirdDialect.cs
+++ b/src/NHibernate/Dialect/FirebirdDialect.cs
@@ -276,21 +276,33 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"avg",
 			"base_name",
 			"before",
+			"bit_length",
 			"blob sub_type 1",
+			"boolean",
 			"break",
 			"cache",
 			"cascade",
+			"char_length",
+			"character_length",
 			"check_point_length",
 			"coalesce",
+			"comment",
 			"committed",
 			"computed",
 			"conditional",
 			"connection_id",
 			"containing",
+			"corr",
 			"count",
+			"covar_pop",
+			"covar_samp",
 			"cstring",
+			"current_connection",
+			"current_transaction",
 			"database",
 			"debug",
+			"decfloat",
+			"deleting",
 			"desc",
 			"descending",
 			"descriptor",
@@ -309,6 +321,8 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"inactive",
 			"index",
 			"input_type",
+			"inserting",
+			"int128",
 			"isolation",
 			"key",
 			"last",
@@ -318,6 +332,7 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"log_buffer_size",
 			"logfile",
 			"long",
+			"lower",
 			"manual",
 			"max",
 			"maximum_segment",
@@ -328,11 +343,13 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"nullif",
 			"nulls",
 			"num_log_buffers",
+			"octet_length",
+			"offset",
 			"option",
 			"output_type",
 			"overflow",
-			"page",
 			"page_size",
+			"page",
 			"pages",
 			"password",
 			"plan",
@@ -340,17 +357,36 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"post_event",
 			"privileges",
 			"protected",
+			"publication",
 			"raw_partitions",
 			"rdb$db_key",
+			"rdb$error",
+			"rdb$get_context",
+			"rdb$get_transaction_cn",
+			"rdb$record_version",
+			"rdb$role_in_use",
+			"rdb$set_context",
+			"rdb$system_privilege",
 			"read",
 			"record_version",
 			"recreate",
+			"regr_avgx",
+			"regr_avgy",
+			"regr_count",
+			"regr_intercept",
+			"regr_r2",
+			"regr_slope",
+			"regr_sxx",
+			"regr_sxy",
+			"regr_syy",
 			"reserv",
 			"reserving",
+			"resetting",
 			"restrict",
 			"retain",
 			"returning_values",
 			"role",
+			"row_count",
 			"rows_affected",
 			"schema",
 			"segment",
@@ -366,15 +402,23 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 			"starting",
 			"starts",
 			"statistics",
+			"stddev_pop",
+			"stddev_samp",
 			"sub_type",
 			"substring",
 			"sum",
 			"suspend",
-			"transaction",
 			"transaction_id",
+			"transaction",
+			"trim",
 			"type",
+			"unbounded",
 			"uncommitted",
+			"updating",
 			"upper",
+			"var_pop",
+			"var_samp",
+			"varbinary",
 			"variable",
 			"view",
 			"wait",