diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
index 34df34067..d79fd1b7c 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
@@ -94,27 +94,51 @@ public class SnowflakeDatabaseMetaData implements DatabaseMetaData {
 
   // These are keywords not in SQL2003 standard
   private static final String notSQL2003Keywords =
-      "ACCOUNT,DATABASE,SCHEMA,VIEW,ISSUE,DATE_PART,EXTRACT,"
-          + "POSITION,TRY_CAST,BIT,DATETIME,NUMBERC,OBJECT,BYTEINT,STRING,TEXT,"
-          + "TIMESTAMPLTZ,TIMESTAMPNTZ,TIMESTAMPTZ,TIMESTAMP_LTZ,TIMESTAMP_NTZ,TIMESTAMP_TZ,TINYINT,"
-          + "VARBINARY,VARIANT,ACCOUNTS,ACTION,ACTIVATE,ASC,AUTOINCREMENT,BEFORE,"
-          + "BUILTIN,BYTE,CACHE,CHANGE,CLEAREPCACHE,CLONE,CLUSTER,CLUSTERS,COLUMNS,COMMENT,"
-          + "COMPRESSION,CONSTRAINTS,COPY,CP,CREDENTIALS,D,DATA,DATABASES,DEFERRABLE,"
-          + "DEFERRED,DELIMITED,DESC,DIRECTORY,DISABLE,DUAL,ENABLE,ENFORCED,"
-          + "EXCLUSIVE,EXPLAIN,EXPORTED,FAIL,FIELDS,FILE,FILES,FIRST,FN,FORCE,FORMAT,"
-          + "FORMATS,FUNCTIONS,GRANTS,GSINSTANCE,GSINSTANCES,HELP,HIBERNATE,HINTS,"
-          + "HISTORY,IDENTIFIED,IMMUTABLE,IMPORTED,INCIDENT,INCIDENTS,INFO,INITIALLY,"
-          + "ISSUES,KEEP,KEY,KEYS,LAST,LIMIT,LIST,LOAD,LOCATION,LOCK,LOCKS,LS,MANAGE,MAP,MATCHED,"
-          + "MATERIALIZED,MODIFY,MONITOR,MONITORS,NAME,NETWORK,NEXT,NORELY,NOTIFY,NOVALIDATE,NULLS,OBJECTS,"
-          + "OFFSET,OJ,OPERATE,OPERATION,OPTION,OWNERSHIP,PARAMETERS,PARTIAL,"
-          + "PERCENT,PLAN,PLUS,POLICIES,POLICY,POOL,PRESERVE,PRIVILEGES,PUBLIC,PURGE,PUT,QUIESCE,"
-          + "READ,RECLUSTER,REFERENCE,RELY,REMOVE,RENAME,REPLACE,REPLACE_FAIL,RESOURCE,"
-          + "RESTART,RESTORE,RESTRICT,RESUME,REWRITE,RM,ROLE,ROLES,RULE,SAMPLE,SCHEMAS,SEMI,"
-          + "SEQUENCE,SEQUENCES,SERVER,SERVERS,SESSION,SETLOGLEVEL,SETS,SFC,SHARE,SHARED,SHARES,SHOW,SHUTDOWN,SIMPLE,SORT,"
-          + "STAGE,STAGES,STATEMENT,STATISTICS,STOP,STORED,STRICT,STRUCT,SUSPEND,SUSPEND_IMMEDIATE,SWAP,SWITCH,T,"
-          + "TABLES,TEMP,TEMPORARY,TRANSACTION,TRANSACTIONS,TRANSIENT,TRIGGERS,TRUNCATE,TS,TYPE,UNDROP,UNLOCK,UNSET,"
-          + "UPGRADE,USAGE,USE,USERS,UTC,UTCTIMESTAMP,VALIDATE,VARIABLES,VERSION,VIEWS,VOLATILE,VOLUME,"
-          + "VOLUMES,WAREHOUSE,WAREHOUSES,WARN,WORK,WRITE,ZONE,INCREMENT,MINUS,REGEXP,RLIKE";
+      String.join(
+          ",",
+          "ACCOUNT",
+          "ASOF",
+          "BIT",
+          "BYTEINT",
+          "CONNECTION",
+          "DATABASE",
+          "DATETIME",
+          "DATE_PART",
+          "FIXED",
+          "FOLLOWING",
+          "GSCLUSTER",
+          "GSPACKAGE",
+          "IDENTIFIER",
+          "ILIKE",
+          "INCREMENT",
+          "ISSUE",
+          "LONG",
+          "MAP",
+          "MATCH_CONDITION",
+          "MINUS",
+          "NUMBER",
+          "OBJECT",
+          "ORGANIZATION",
+          "QUALIFY",
+          "REFERENCE",
+          "REGEXP",
+          "RLIKE",
+          "SAMPLE",
+          "SCHEMA",
+          "STRING",
+          "TEXT",
+          "TIMESTAMPLTZ",
+          "TIMESTAMPNTZ",
+          "TIMESTAMPTZ",
+          "TIMESTAMP_LTZ",
+          "TIMESTAMP_NTZ",
+          "TIMESTAMP_TZ",
+          "TINYINT",
+          "TRANSIT",
+          "TRY_CAST",
+          "VARIANT",
+          "VECTOR",
+          "VIEW");
 
   private final Connection connection;
 
diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java
index e3659df39..d3176f8b2 100644
--- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java
@@ -2333,4 +2333,13 @@ public void testGetJDBCVersion() throws SQLException {
       assertEquals(2, metaData.getJDBCMinorVersion());
     }
   }
+
+  /** Added in > 3.15.1 */
+  @Test
+  public void testKeywordsCount() throws SQLException {
+    try (Connection connection = getConnection()) {
+      DatabaseMetaData metaData = connection.getMetaData();
+      assertEquals(43, metaData.getSQLKeywords().split(",").length);
+    }
+  }
 }