diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
index 15d4c8ce9..c727836de 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
@@ -450,6 +450,7 @@ public static String javaTypeToClassName(int type) throws SQLException {
         return Double.class.getName();
 
       case Types.TIMESTAMP:
+      case Types.TIMESTAMP_WITH_TIMEZONE:
         return Timestamp.class.getName();
 
       case Types.DATE:
diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java
index 333fc649c..18e0a83d9 100644
--- a/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java
@@ -541,6 +541,8 @@ public void testGetDataTypeWithTimestampTz() throws SQLException {
       ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
       // Assert that TIMESTAMP_TZ type matches java.sql.TIMESTAMP_WITH_TIMEZONE
       assertEquals(resultSetMetaData.getColumnType(1), 2014);
+      // Assert that TIMESTAMP_TZ column returns Timestamp class name
+      assertEquals(resultSetMetaData.getColumnClassName(1), Timestamp.class.getName());
     }
   }
 }