diff --git a/tck/src/main/java/com/sun/ts/tests/jstl/compat/onedotzero/JSTLClientIT.java b/tck/src/main/java/com/sun/ts/tests/jstl/compat/onedotzero/JSTLClientIT.java
index 9b1d2c9b..ab48fca7 100644
--- a/tck/src/main/java/com/sun/ts/tests/jstl/compat/onedotzero/JSTLClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/jstl/compat/onedotzero/JSTLClientIT.java
@@ -757,7 +757,7 @@ public void positiveSetSelectVarTest() throws Exception {
      * @assertion_ids: JSTL:SPEC:57.1; JSTL:SPEC:57.1.1; JSTL:SPEC:57.1.2; JSTL:SPEC:57.1.3
      * 
      * @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
-     * PST) or fully qualified values (ex. America/Los_Angeles).
+     * America/Los_Angeles).
      */
     @Test
     public void positiveSetTimezoneValueTest() throws Exception {
@@ -779,7 +779,7 @@ public void positiveSetTimezoneValueTest() throws Exception {
      * @assertion_ids: JSTL:SPEC:57.1; JSTL:SPEC:57.1.1; JSTL:SPEC:57.1.2; JSTL:SPEC:57.1.3
      * 
      * @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
-     * PST) or fully qualified values (ex. America/Los_Angeles).
+     * America/Los_Angeles).
      */
     @Test
     public void positiveTimezoneValueTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/JSTLClientIT.java b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/JSTLClientIT.java
index bec0797c..f109ae0c 100644
--- a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/JSTLClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/JSTLClientIT.java
@@ -235,7 +235,7 @@ public void positiveFDValueNullTest() throws Exception {
      * @assertion_ids: JSTL:SPEC:57.11
      * 
      * @testStrategy: Validate that if timeZone is null or empty, the value will be formatted as if it was present. In this
-     * case, the time will be formatted using the page's time zone of EST.
+     * case, the time will be formatted using the page's time zone of America/New_York.
      */
     @Test
     public void positiveFDTimeZoneNullEmptyTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/JSTLClientIT.java b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/JSTLClientIT.java
index f41cc015..2d886d89 100644
--- a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/JSTLClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/JSTLClientIT.java
@@ -457,7 +457,7 @@ public void positivePDTimeZoneTest() throws Exception {
      * @assertion_ids: JSTL:SPEC:58.25
      * 
      * @testStrategy: Validate that if timeZone is null or empty, the value will be formatted as if it was missing. In this
-     * case, the time will be formatted using the page's time zone of EST. Pass the parsed value to formatDate to display
+     * case, the time will be formatted using the page's time zone of America/New_York. Pass the parsed value to formatDate to display
      * (due to possible timezone difference).
      */
     @Test
diff --git a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/JSTLClientIT.java b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/JSTLClientIT.java
index efdaa9c3..fb906f48 100644
--- a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/JSTLClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/JSTLClientIT.java
@@ -79,7 +79,7 @@ public static WebArchive createDeployment() throws IOException {
      * JSTL:SPEC:93.1.5; JSTL:SPEC:93.1.6
      * 
      * @testStrategy: Validate that the value attribute can accept dynamic values as well as three letter timezones (ex.
-     * PST) or fully qualified values (ex. America/Los_Angeles).
+     * America/Los_Angeles).
      */
     @Test
     public void positiveSetTimezoneValueTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/timezone/JSTLClientIT.java b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/timezone/JSTLClientIT.java
index f5b6f95a..4b34fc9a 100644
--- a/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/timezone/JSTLClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/jstl/spec/fmt/format/timezone/JSTLClientIT.java
@@ -64,7 +64,7 @@ public static WebArchive createDeployment() throws IOException {
      * @assertion_ids: JSTL:SPEC:54; JSTL:SPEC:54.1; JSTL:SPEC:54.1.1; JSTL:SPEC:54.1.2; JSTL:SPEC:54.1.3
      * 
      * @testStrategy: Validate that the value attribute can accept both static values as well as three letter timezones (ex.
-     * PST) or fully qualified values (ex. America/Los_Angeles).
+     * America/Los_Angeles).
      */
     @Test
     public void positiveTimezoneValueTest() throws Exception {
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFDValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFDValueTest.jsp
index abe6f12a..e99ade44 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFDValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFDValueTest.jsp
@@ -27,7 +27,7 @@
         pageContext.setAttribute("dte", date);
     %>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <!-- EL: Validate the the action can properly format a date
              Date -->
     <fmt:formatDate value="${dte}"/><br>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp
index 60b815e1..f14b0e86 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
     <fmt:setLocale value="de_DE"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
index 503986b7..42a1b2b3 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -28,7 +28,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
     <fmt:setLocale value="de_DE"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positivePDValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positivePDValueTest.jsp
index 66d64546..da4b781e 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positivePDValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positivePDValueTest.jsp
@@ -23,7 +23,7 @@
 <tck:test testName="positivePDValueTest">
     <c:set var="dte" value="Nov 21, 2000"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <!-- EL: Validate the the action can properly parse a date
              provided as a dynamic or static value. -->
     <fmt:parseDate value="${dte}" var="e1"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
index 4e940e36..6806da78 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
@@ -25,12 +25,12 @@
 <%@ page import="java.util.TimeZone,java.util.Date" %>
 <tck:test testName="positiveTimezoneValueTest">
    <%
-        TimeZone tz = TimeZone.getTimeZone("PST");
+        TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
         pageContext.setAttribute("tz", tz);
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <c:set var="mtz" value="PST"/>
+    <c:set var="mtz" value="America/Los_Angeles"/>
     <!-- EL: Behavioral test of value attribute -->
     <!-- Timezone object -->
     <fmt:setTimeZone value="${tz}"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
index 9c885d20..ed1bffeb 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
@@ -25,12 +25,12 @@
 <%@ page import="java.util.TimeZone,java.util.Date" %>
 <tck:test testName="positiveTimezoneValueTest">
     <%
-        TimeZone tz = TimeZone.getTimeZone("PST");
+        TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
         pageContext.setAttribute("tz", tz);
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <c:set var="mtz" value="PST"/>
+    <c:set var="mtz" value="America/Los_Angeles"/>
     <!-- EL: Behavioral test of value attribute -->
     <!-- Timezone object -->
     <fmt:timeZone value="${tz}">
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
index 0da2a394..75fe60d6 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
@@ -34,7 +34,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- dateStyle specifies what date style the formated value
              will be returned in.  This will only be applied
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
index 7ab50424..93b2b536 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
@@ -27,7 +27,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <tck:config op="set" configVar="fallback" value="en-US"/>
     <!-- The fallbackLocale configuration variable will be
              used if no locale match can be determined. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
index a9a25df4..a18a5214 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
@@ -27,7 +27,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources"/>
 
     <!-- Validate that the action is able to dermine the
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDPatternTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDPatternTest.jsp
index 049da3d6..db605bba 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDPatternTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDPatternTest.jsp
@@ -28,7 +28,7 @@
     %>
     <c:set var="pat" value="yyyy.MM.dd G 'at' HH:mm:ss z"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- the pattern attribute specifies a custom pattern
              to be applied when formatting the provided date. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDScopeTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDScopeTest.jsp
index c0827ac4..3fc50129 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDScopeTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDScopeTest.jsp
@@ -27,7 +27,7 @@
         pageContext.setAttribute("dte", date);
     %>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The presence of the scope attribute will cause var to be
              exported to the available scopes of the PageContext.
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
index 8cd4accc..7e1bd759 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
@@ -34,7 +34,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- timeStyle specifies what time style the formated value
              will be returned in.  This will only be applied
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
index 58da89ff..0bec712f 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
@@ -28,7 +28,7 @@
         pageContext.setAttribute("dte", date);
     %>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- If timeZone is null or empty, it will be treated as
              if it was not present. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.gf
index d44d68f3..613775c0 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.gf
@@ -15,22 +15,22 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 7:11:34 PM:<br>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 7:11:34 PM:<br>
       
         Dec 26, 1997, 7:11:34 PM<br>
       
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 7:11:34 PM<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 7:11:34 PM<br>
       Dec 26, 1997, 7:11:34 PM<br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 8:11:34 PM:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 8:11:34 PM:<br>
       
         Dec 26, 1997, 8:11:34 PM<br>
       
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 10:11:34 PM<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 10:11:34 PM<br>
       Dec 26, 1997, 10:11:34 PM<br>
     <br>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
index 8e1d9de2..ebe298b2 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
@@ -27,7 +27,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setLocale value="en_US"/>
 
     <!--  The time zone to be used when formatting operates
@@ -37,22 +37,22 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 7:11:34 PM:<br>
-      <fmt:timeZone value="MST">
-        <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="PST" type="both"/><br>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 7:11:34 PM:<br>
+      <fmt:timeZone value="America/Denver">
+        <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both"/><br>
       </fmt:timeZone>
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 7:11:34 PM<br>
-      <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="PST" type="both"/><br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 7:11:34 PM<br>
+      <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both"/><br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 8:11:34 PM:<br>
-      <fmt:timeZone value="MST">
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 8:11:34 PM:<br>
+      <fmt:timeZone value="America/Denver">
         <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
       </fmt:timeZone>
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 10:11:34 PM<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 10:11:34 PM<br>
       <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
     <br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTestJava20Plus.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTestJava20Plus.gf
index f97511b8..c421af75 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTestJava20Plus.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTestJava20Plus.gf
@@ -15,22 +15,22 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 7:11:34 PM:<br>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 7:11:34 PM:<br>
       
         Dec 26, 1997, 7:11:34 PM<br>
       
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 7:11:34 PM<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 7:11:34 PM<br>
       Dec 26, 1997, 7:11:34 PM<br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be 8:11:34 PM:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be 8:11:34 PM:<br>
       
         Dec 26, 1997, 8:11:34 PM<br>
       
 
-      Not wrapped.  Page has a time zone of EST.  Time should be 10:11:34 PM<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should be 10:11:34 PM<br>
       Dec 26, 1997, 10:11:34 PM<br>
     <br>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.gf
index e7d63d5c..3e858435 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.gf
@@ -10,7 +10,7 @@
 
     <!-- The time zone to be applied to the formatted value can                   be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be minus 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be minus 3 hours.<br>
     No timeZone attribute: Dec 26, 1997, 10:11:34 PM<br>
     Dec 26, 1997, 7:11:34 PM<br>
     Dec 26, 1997, 7:11:34 PM<br>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
index a750507f..277fe288 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
@@ -26,18 +26,18 @@
     <%  
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
-        pageContext.setAttribute("tz", TimeZone.getTimeZone("PST"));
+        pageContext.setAttribute("tz", TimeZone.getTimeZone("America/Los_Angeles"));
     %>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The time zone to be applied to the formatted value can
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be minus 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be minus 3 hours.<br>
     No timeZone attribute: <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>' type="both"/><br>
     <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>'
                        timeZone='<%= (TimeZone) pageContext.getAttribute("tz") %>' type="both"/><br>
     <fmt:formatDate value='<%= (Date) pageContext.getAttribute("dte") %>'
-                       timeZone="PST" type="both"/><br>
+                       timeZone="America/Los_Angeles" type="both"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTestJava20Plus.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTestJava20Plus.gf
index d07829c5..5c636dea 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTestJava20Plus.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTestJava20Plus.gf
@@ -10,7 +10,7 @@
 
     <!-- The time zone to be applied to the formatted value can                   be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be minus 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be minus 3 hours.<br>
     No timeZone attribute: Dec 26, 1997, 10:11:34 PM<br>
     Dec 26, 1997, 7:11:34 PM<br>
     Dec 26, 1997, 7:11:34 PM<br>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
index 41c6e7d7..9407dc0a 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
@@ -32,7 +32,7 @@
     <c:set var="dat" value="date"/>
     <c:set var="bot" value="both"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- the type attribute specifies if either the time or date
              or both components of the provided date value will
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueNullTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueNullTest.jsp
index f5921feb..0b7f9044 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueNullTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueNullTest.jsp
@@ -22,7 +22,7 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positiveFDValueNullEmptyTest">
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- If value is null and var (or scope and var) is specified,
              the scoped variable identified by var is removed.  If 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueTest.jsp
index cdb4105a..54d9d3a8 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDValueTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
     %>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- Validate the the action can properly format a date
              Date -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp
index df669a50..98a93a80 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
     <!-- If the action is not wrapped in a fmt:bundle action,
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
index 733c2ba0..3a367611 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
@@ -28,7 +28,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
     <!-- If the action is not wrapped in a fmt:bundle action,
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp
index 3fc092c8..e2d3bb1c 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.AlgoResources6"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
index 41a7a30f..87d61798 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
@@ -28,7 +28,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.AlgoResources6"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp
index 97e6abe0..39f789be 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
     <fmt:setLocale value="de_DE"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
index cc62a0da..58fa0495 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -28,7 +28,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
     <fmt:setLocale value="de_DE"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp
index a53607e6..5158cf2a 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp
@@ -26,7 +26,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setLocale value="en_US"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
index 0d206a17..e4c0497a 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
@@ -28,7 +28,7 @@
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setLocale value="en_US"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
 
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp
index 54f185e8..bd1f8fce 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp
@@ -21,13 +21,13 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positivePDBodyValueTest">
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The date to be parsed can be provided as body content to the
               action. -->
     <fmt:parseDate type="both" var="e2">
         Nov 21, 2000, 3:45:02 AM
     </fmt:parseDate>
-    <fmt:formatDate value="${e2}" type="both" timeZone="EST"/>
+    <fmt:formatDate value="${e2}" type="both" timeZone="America/New_York"/>
 
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
index cdfb8482..0a5a73ae 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
@@ -23,13 +23,13 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positivePDBodyValueTest">
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The date to be parsed can be provided as body content to the
               action. -->
     <fmt:parseDate type="both" var="e2">
         Nov 21, 2000, 3:45:02 AM
     </fmt:parseDate>
-    <fmt:formatDate value="${e2}" type="both" timeZone="EST"/>
+    <fmt:formatDate value="${e2}" type="both" timeZone="America/New_York"/>
 
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTest.jsp
index 75da0b07..836961d1 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTest.jsp
@@ -27,7 +27,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- dateStyle specifies the formatting style that determines how
              the provided value will be parsed. dateStyle should be
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
index 46e9dbfb..49089711 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
@@ -29,7 +29,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- dateStyle specifies the formatting style that determines how
              the provided value will be parsed. dateStyle should be
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.jsp
index 01d01f36..dfa842a9 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.jsp
@@ -22,7 +22,7 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <%@ page import="java.util.Date" %>
 <tck:test testName="positivePDFallbackLocaleTest">
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dte" value="Nov 21, 2000"/>
     <c:set var="dtim" value="3:45:02 AM"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/> 
@@ -33,7 +33,7 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' var="r1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dtim") %>' type="time" var="r2"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>' type="both" var="r3"/>
-    <fmt:formatDate value="${r1}" timeZone="EST"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
-    <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York" type="time"/><br>
+    <fmt:formatDate value="${r3}" timeZone="America/New_York" type="both"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
index d31a5db7..6c2c1e89 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
@@ -24,7 +24,7 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <%@ page import="java.util.Date" %>
 <tck:test testName="positivePDFallbackLocaleTest">
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dte" value="Nov 21, 2000"/>
     <c:set var="dtim" value="3:45:02 AM"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/> 
@@ -35,7 +35,7 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' var="r1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dtim") %>' type="time" var="r2"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>' type="both" var="r3"/>
-    <fmt:formatDate value="${r1}" timeZone="EST"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
-    <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York" type="time"/><br>
+    <fmt:formatDate value="${r3}" timeZone="America/New_York" type="both"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTest.jsp
index c3b42905..74ded262 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTest.jsp
@@ -21,7 +21,7 @@
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positivePDLocalizationContextTest">
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dte" value="Nov 21, 2000"/>
     <c:set var="dtim" value="3:45:02 AM"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/> 
@@ -33,8 +33,8 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' var="r1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dtim") %>' type="time" var="r2"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>' type="both" var="r3"/>
-    <fmt:formatDate value="${r1}" timeZone="EST"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
-    <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York" type="time"/><br>
+    <fmt:formatDate value="${r3}" timeZone="America/New_York" type="both"/><br>
 
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
index 3a6a2d14..95805d0c 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
@@ -23,7 +23,7 @@
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positivePDLocalizationContextTest">
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <c:set var="dte" value="Nov 21, 2000"/>
     <c:set var="dtim" value="3:45:02 AM"/>
     <c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/> 
@@ -35,8 +35,8 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' var="r1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dtim") %>' type="time" var="r2"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>' type="both" var="r3"/>
-    <fmt:formatDate value="${r1}" timeZone="EST"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
-    <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York" type="time"/><br>
+    <fmt:formatDate value="${r3}" timeZone="America/New_York" type="both"/><br>
 
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleNullEmptyTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleNullEmptyTest.jsp
index 174ff1d7..1030f7b3 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleNullEmptyTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleNullEmptyTest.jsp
@@ -21,13 +21,13 @@
 <%@ taglib prefix="tck" uri="http://java.sun.com/jstltck/jstltck-util" %>
 <tck:test testName="positivePDParseLocaleNullEmptyTest">
     <fmt:setLocale value="en-US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- if parseLocale is null or empty, it is treated as if
              not specified. The locale configuration variable should be used.-->
     <fmt:parseDate value="Nov 21, 2000" parseLocale='<%= null %>' var="r1"/>
     <fmt:parseDate value="Nov 21, 2000" parseLocale="" var="r2"/>
-    <fmt:formatDate value="${r1}" timeZone="EST"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York"/><br>
 
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTest.jsp
index 4cc0c4ee..61bc17f2 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTest.jsp
@@ -28,7 +28,7 @@
     <c:set var="dte" value="Nov 21, 2000, 3:45:02 AM"/>
     <c:set var="us" value="en_US"/>
     <fmt:setLocale value="de_DE"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- parseLocale specifies the locale specific formatting pattern
              to apply when parsing the provided value.  The presence of this
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
index d78daa59..333b40fb 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
@@ -30,7 +30,7 @@
     <c:set var="dte" value="Nov 21, 2000, 3:45:02 AM"/>
     <c:set var="us" value="en_US"/>
     <fmt:setLocale value="de_DE"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- parseLocale specifies the locale specific formatting pattern
              to apply when parsing the provided value.  The presence of this
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDPatternTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDPatternTest.jsp
index c75e3f04..d78c9935 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDPatternTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDPatternTest.jsp
@@ -22,9 +22,9 @@
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <tck:test testName="positivePDPatternTest">
     <c:set var="pat" value="yyyy.MM.dd G 'at' HH:mm:ss z"/>
-    <c:set var="dte" value="2000.11.21 AD at 03:45:02 EST"/>
+    <c:set var="dte" value="2000.11.21 AD at 03:45:02 GMT-05:00"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- the pattern attribute specifies a custom pattern
              to be applied when parsing the provided date. -->
@@ -32,6 +32,6 @@
                        pattern='<%= (String) pageContext.getAttribute("pat") %>' var="r1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
                        pattern="yyyy.MM.dd G 'at' HH:mm:ss z" var="r2"/>
-    <fmt:formatDate value="${r1}" timeZone="EST" pattern="${pat}"/><br>
-    <fmt:formatDate value="${r2}" timeZone="EST" pattern="${pat}"/><br>
+    <fmt:formatDate value="${r1}" timeZone="America/New_York" pattern="${pat}"/><br>
+    <fmt:formatDate value="${r2}" timeZone="America/New_York" pattern="${pat}"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTest.jsp
index d34d66c5..69ac5474 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTest.jsp
@@ -27,7 +27,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- timeStyle specifies formatting style that determines how
              the provided value will be parsed. timeStyle should be
@@ -83,12 +83,12 @@
      <fmt:parseDate value="3:45:02 AM"
                        timeStyle='<%= (String) pageContext.getAttribute("med") %>' type="time"/><br>
      <fmt:parseDate value="3:45:03 AM" timeStyle="medium" type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST"
+     <fmt:parseDate value="3:45:03 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("lon") %>' type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST" timeStyle="long" type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST"
+     <fmt:parseDate value="3:45:03 AM GMT-05:00" timeStyle="long" type="time"/><br>
+     <fmt:parseDate value="3:45:03 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("ful") %>' type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST" timeStyle="full" type="time"/><br>
+     <fmt:parseDate value="3:45:03 AM GMT-05:00" timeStyle="full" type="time"/><br>
 
      <br>'type' set to 'both' -- timeStyle should be applied.<br>
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" type="both"/><br>
@@ -102,11 +102,11 @@
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM"
                        timeStyle='<%= (String) pageContext.getAttribute("med") %>' type="both"/><br>
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" timeStyle="medium" type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("lon") %>' type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST" timeStyle="long" type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00" timeStyle="long" type="both"/><br>
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("ful") %>' type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle="full" type="both"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
index 59031281..9202e1c2 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
@@ -29,7 +29,7 @@
     <c:set var="lon" value="long"/>
     <c:set var="ful" value="full"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
      <!-- timeStyle specifies formatting style that determines how
              the provided value will be parsed. timeStyle should be
@@ -85,12 +85,12 @@
      <fmt:parseDate value="3:45:02 AM"
                        timeStyle='<%= (String) pageContext.getAttribute("med") %>' type="time"/><br>
      <fmt:parseDate value="3:45:03 AM" timeStyle="medium" type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST"
+     <fmt:parseDate value="3:45:03 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("lon") %>' type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST" timeStyle="long" type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST"
+     <fmt:parseDate value="3:45:03 AM GMT-05:00" timeStyle="long" type="time"/><br>
+     <fmt:parseDate value="3:45:03 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("ful") %>' type="time"/><br>
-     <fmt:parseDate value="3:45:03 AM EST" timeStyle="full" type="time"/><br>
+     <fmt:parseDate value="3:45:03 AM GMT-05:00" timeStyle="full" type="time"/><br>
 
      <br>'type' set to 'both' -- timeStyle should be applied.<br>
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" type="both"/><br>
@@ -104,11 +104,11 @@
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM"
                        timeStyle='<%= (String) pageContext.getAttribute("med") %>' type="both"/><br>
      <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" timeStyle="medium" type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("lon") %>' type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST" timeStyle="long" type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00" timeStyle="long" type="both"/><br>
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle='<%= (String) pageContext.getAttribute("ful") %>' type="both"/><br>
-     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM EST"
+     <fmt:parseDate value="Nov 21, 2000, 3:45:02 AM GMT-05:00"
                        timeStyle="full" type="both"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
index f2ade709..6a0f4b48 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
@@ -23,7 +23,7 @@
 <tck:test testName="positivePDTimeZoneNullEmptyTest">
     <c:set var="dt" value="Nov 21, 2000, 3:45 AM"/> 
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="MST"/>
+    <fmt:setTimeZone value="America/Denver"/>
 
     <!-- If timeZone is null or empty, it will be treated as
              if it was not present (only type short times is specified
@@ -32,6 +32,6 @@
                        timeZone='<%= null %>' type="both" timeStyle="short" var="rn1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>'
                        timeZone="" type="both" timeStyle="short" var="re1"/>
-    <fmt:formatDate value="${rn1}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${re1}" timeZone="EST" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rn1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${re1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
index adab105f..7c618270 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
@@ -25,7 +25,7 @@
 <tck:test testName="positivePDTimeZoneNullEmptyTest">
     <c:set var="dt" value="Nov 21, 2000, 3:45 AM"/> 
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="MST"/>
+    <fmt:setTimeZone value="America/Denver"/>
 
     <!-- If timeZone is null or empty, it will be treated as
              if it was not present (only type short times is specified
@@ -34,6 +34,6 @@
                        timeZone='<%= null %>' type="both" timeStyle="short" var="rn1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dt") %>'
                        timeZone="" type="both" timeStyle="short" var="re1"/>
-    <fmt:formatDate value="${rn1}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${re1}" timeZone="EST" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rn1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${re1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.gf
index 9d169974..926707db 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.gf
@@ -16,25 +16,25 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 3 hours:<br>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 3 hours:<br>
       
         
       
       Nov 21, 2000, 6:45 AM<br>
 
-      Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
+      Not wrapped.  Page has a time zone of America/New_York, timeZone attribute specified.  Time should be offset by 3 hours:<br>
       <br>
       Nov 21, 2000, 6:45 AM<br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 2 hours:<br>
       
         <br>
       
       Nov 21, 2000, 5:45 AM<br>
       
-      Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should not be offset:<br>
       <br>
       Nov 21, 2000, 3:45 AM<br>
     <br>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.jsp
index 53d42dde..8dacc328 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTest.jsp
@@ -23,7 +23,7 @@
 <%@ page import="java.util.Date" %>
 <tck:test testName="positivePDTimeZonePrecedenceTest">
     <c:set var="dte" value="Nov 21, 2000, 3:45 AM"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setLocale value="en_US"/>
 
     <!--  The time zone to be used when formatting operates
@@ -33,26 +33,26 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 3 hours:<br>
-      <fmt:timeZone value="MST">
-        <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="PST" type="both" timeStyle="short" var="rd1"/>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 3 hours:<br>
+      <fmt:timeZone value="America/Denver">
+        <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rd1"/>
       </fmt:timeZone>
-      <fmt:formatDate value="${rd1}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 
-      Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
-      <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="PST" type="both" timeStyle="short" var="rd2"/><br>
-      <fmt:formatDate value="${rd2}" timeZone="EST" type="both" timeStyle="short"/><br>
+      Not wrapped.  Page has a time zone of America/New_York, timeZone attribute specified.  Time should be offset by 3 hours:<br>
+      <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rd2"/><br>
+      <fmt:formatDate value="${rd2}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
-      <fmt:timeZone value="MST">
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 2 hours:<br>
+      <fmt:timeZone value="America/Denver">
         <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd3"/><br>
       </fmt:timeZone>
-      <fmt:formatDate value="${rd3}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd3}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
       
-      Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should not be offset:<br>
       <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd4"/><br>
-      <fmt:formatDate value="${rd4}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd4}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
     <br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
index b388777d..720dc154 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
@@ -16,25 +16,25 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 3 hours:<br>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 3 hours:<br>
       
         
       
       Nov 21, 2000, 6:45 AM<br>
 
-      Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
+      Not wrapped.  Page has a time zone of America/New_York, timeZone attribute specified.  Time should be offset by 3 hours:<br>
       <br>
       Nov 21, 2000, 6:45 AM<br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 2 hours:<br>
       
         <br>
       
       Nov 21, 2000, 5:45 AM<br>
       
-      Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should not be offset:<br>
       <br>
       Nov 21, 2000, 3:45 AM<br>
     <br>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
index c41520f4..811fd34c 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
@@ -25,7 +25,7 @@
 <%@ page import="java.util.Date" %>
 <tck:test testName="positivePDTimeZonePrecedenceTest">
     <c:set var="dte" value="Nov 21, 2000, 3:45 AM"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
     <fmt:setLocale value="en_US"/>
 
     <!--  The time zone to be used when formatting operates
@@ -35,26 +35,26 @@
                 value.
               - Use the value of the scoped attribute
                 jakarta.servlet.jsp.jstl.fmt.timeZone. -->
-    <br>TimeZone attribute specified with a value of PST:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 3 hours:<br>
-      <fmt:timeZone value="MST">
-        <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="PST" type="both" timeStyle="short" var="rd1"/>
+    <br>TimeZone attribute specified with a value of America/Los_Angeles:<br>
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 3 hours:<br>
+      <fmt:timeZone value="America/Denver">
+        <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rd1"/>
       </fmt:timeZone>
-      <fmt:formatDate value="${rd1}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 
-      Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
-      <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="PST" type="both" timeStyle="short" var="rd2"/><br>
-      <fmt:formatDate value="${rd2}" timeZone="EST" type="both" timeStyle="short"/><br>
+      Not wrapped.  Page has a time zone of America/New_York, timeZone attribute specified.  Time should be offset by 3 hours:<br>
+      <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rd2"/><br>
+      <fmt:formatDate value="${rd2}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 
     <br>No TimeZone attribute specified:<br>
-      Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
-      <fmt:timeZone value="MST">
+      Wrapped by &lt;fmt:timeZone&gt; action with America/Denver.  Time should be offset by 2 hours:<br>
+      <fmt:timeZone value="America/Denver">
         <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd3"/><br>
       </fmt:timeZone>
-      <fmt:formatDate value="${rd3}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd3}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
       
-      Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
+      Not wrapped.  Page has a time zone of America/New_York.  Time should not be offset:<br>
       <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd4"/><br>
-      <fmt:formatDate value="${rd4}" timeZone="EST" type="both" timeStyle="short"/><br>
+      <fmt:formatDate value="${rd4}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
     <br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.gf
index db3c818c..95cf12c3 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.gf
@@ -12,7 +12,7 @@
     <!-- The time zone to be applied to the formatted value can
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be offset 3 hours.<br>
     
     
     
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.jsp
index 346c1611..1e21f9d9 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTest.jsp
@@ -23,22 +23,22 @@
 <%@ page import="java.util.TimeZone" %>
 <tck:test testName="positivePDTimeZoneTest">
     <%
-        pageContext.setAttribute("tz", TimeZone.getTimeZone("PST"));
+        pageContext.setAttribute("tz", TimeZone.getTimeZone("America/Los_Angeles"));
     %>
     <c:set var="dte" value="Nov 21, 2000, 3:45 AM"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The time zone to be applied to the formatted value can
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be offset 3 hours.<br>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rdef"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
                        timeZone='<%= (TimeZone) pageContext.getAttribute("tz") %>' type="both" timeStyle="short" var="rpst1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
-                       timeZone="PST" type="both" timeStyle="short" var="rpst2"/>
-    No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${rpst1}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${rpst2}" timeZone="EST" type="both" timeStyle="short"/><br>
+                       timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rpst2"/>
+    No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rpst1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rpst2}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
index f6c3e4fa..c33a7572 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
@@ -12,7 +12,7 @@
     <!-- The time zone to be applied to the formatted value can
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be offset 3 hours.<br>
     
     
     
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
index 7a8aa42a..ae016d4e 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
@@ -25,22 +25,22 @@
 <%@ page import="java.util.TimeZone" %>
 <tck:test testName="positivePDTimeZoneTest">
     <%
-        pageContext.setAttribute("tz", TimeZone.getTimeZone("PST"));
+        pageContext.setAttribute("tz", TimeZone.getTimeZone("America/Los_Angeles"));
     %>
     <c:set var="dte" value="Nov 21, 2000, 3:45 AM"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- The time zone to be applied to the formatted value can
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
-    <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
+    <br>Page is using America/New_York for the timezone.  The formatting action will use America/Los_Angeles.  Value should be offset 3 hours.<br>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rdef"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
                        timeZone='<%= (TimeZone) pageContext.getAttribute("tz") %>' type="both" timeStyle="short" var="rpst1"/>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
-                       timeZone="PST" type="both" timeStyle="short" var="rpst2"/>
-    No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${rpst1}" timeZone="EST" type="both" timeStyle="short"/><br>
-    <fmt:formatDate value="${rpst2}" timeZone="EST" type="both" timeStyle="short"/><br>
+                       timeZone="America/Los_Angeles" type="both" timeStyle="short" var="rpst2"/>
+    No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rpst1}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
+    <fmt:formatDate value="${rpst2}" timeZone="America/New_York" type="both" timeStyle="short"/><br>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp
index 59f6b630..4737a332 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp
@@ -28,7 +28,7 @@
     <c:set var="dat" value="date"/>
     <c:set var="bot" value="both"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- the type attribute specifies the the type of date
              information is contained in the value to be parsed. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
index dd83749c..c31d022b 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
@@ -30,7 +30,7 @@
     <c:set var="dat" value="date"/>
     <c:set var="bot" value="both"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- the type attribute specifies the the type of date
              information is contained in the value to be parsed. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDValueTest.jsp
index cb7415fe..71120999 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDValueTest.jsp
@@ -23,7 +23,7 @@
 <tck:test testName="positivePDValueTest">
     <c:set var="dte" value="Nov 21, 2000"/>
     <fmt:setLocale value="en_US"/>
-    <fmt:setTimeZone value="EST"/>
+    <fmt:setTimeZone value="America/New_York"/>
 
     <!-- Validate the the action can properly parse a date
              provided as a dynamic or static value. -->
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneAttrScopeTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneAttrScopeTest.jsp
index cbc3f25f..7dcb6e9d 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneAttrScopeTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneAttrScopeTest.jsp
@@ -25,19 +25,19 @@
     <!-- If scope is specified and var is not, the
              jakarta.servlet.jsp.jstl.fmt.timeZone attribute will
              be set to the scope specified (implicit or explicit). -->
-    <fmt:setTimeZone value="PST"/>
+    <fmt:setTimeZone value="America/Los_Angeles"/>
     <tck:checkScope varName="jakarta.servlet.jsp.jstl.fmt.timeZone" useConfig="true"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.page"/>
-    <fmt:setTimeZone value="PST" scope="page"/>
+    <fmt:setTimeZone value="America/Los_Angeles" scope="page"/>
     <tck:checkScope varName="jakarta.servlet.jsp.jstl.fmt.timeZone" useConfig="true"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.page"/>
-    <fmt:setTimeZone value="PST" scope="request"/>
+    <fmt:setTimeZone value="America/Los_Angeles" scope="request"/>
     <tck:checkScope varName="jakarta.servlet.jsp.jstl.fmt.timeZone" inScope="request" useConfig="true"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.request"/>
-    <fmt:setTimeZone value="PST" scope="session"/>
+    <fmt:setTimeZone value="America/Los_Angeles" scope="session"/>
     <tck:checkScope varName="jakarta.servlet.jsp.jstl.fmt.timeZone" inScope="session" useConfig="true"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.session"/>
-    <fmt:setTimeZone value="PST" scope="application"/>
+    <fmt:setTimeZone value="America/Los_Angeles" scope="application"/>
     <tck:checkScope varName="jakarta.servlet.jsp.jstl.fmt.timeZone" inScope="application" useConfig="true"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.applciation"/>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneScopeTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneScopeTest.jsp
index ae6a8854..6086df7a 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneScopeTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneScopeTest.jsp
@@ -24,11 +24,11 @@
     <!-- Validate that that var is exported to the appropriate
              scope as specified by the scope attribute explicitly
              or implicitly. -->
-    <fmt:setTimeZone value="PST" var="riPage"/>
-    <fmt:setTimeZone value="PST" var="rePage" scope="page"/>
-    <fmt:setTimeZone value="PST" var="reRequest" scope="request"/>
-    <fmt:setTimeZone value="PST" var="reSession" scope="session"/>
-    <fmt:setTimeZone value="PST" var="reApplication" scope="application"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="riPage"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="rePage" scope="page"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="reRequest" scope="request"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="reSession" scope="session"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="reApplication" scope="application"/>
     <tck:checkScope varName="riPage"/>
     <tck:checkScope varName="rePage"/>
     <tck:checkScope varName="reRequest" inScope="request"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneSetAttrTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneSetAttrTest.jsp
index b10f0112..50e26a79 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneSetAttrTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneSetAttrTest.jsp
@@ -25,7 +25,7 @@
     <!-- timezone action with no var will set the
              jakarta.servlet.jsp.jstl.fmt.timeZone scoped
              attribute -->
-    <fmt:setTimeZone value="PST"/>
+    <fmt:setTimeZone value="America/Los_Angeles"/>
     <tck:config op="get" configVar="timezone" var="rtz"/>
     <tck:isInstance varName="rtz" type="java.util.TimeZone"/>
     <c:remove var="jakarta.servlet.jsp.jstl.fmt.timeZone.page"/>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
index e46c26ca..7e08fada 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
@@ -25,7 +25,7 @@
 <%@ page import="java.util.TimeZone,java.util.Date" %>
 <tck:test testName="positiveTimezoneValueTest">
    <%
-        TimeZone tz = TimeZone.getTimeZone("PST");
+        TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
         pageContext.setAttribute("tz", tz);
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneVarTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneVarTest.jsp
index bc9e5eb5..59e8534d 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneVarTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneVarTest.jsp
@@ -23,6 +23,6 @@
 
     <!-- Timezone can be exported for use by other actions.
              Type should be java.util.Timezone -->
-    <fmt:setTimeZone value="PST" var="rtz"/>
+    <fmt:setTimeZone value="America/Los_Angeles" var="rtz"/>
     <tck:isInstance varName="rtz" type="java.util.TimeZone"/>
 </tck:test>
diff --git a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
index 49b21d3f..7d37389d 100644
--- a/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
+++ b/tck/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
@@ -25,12 +25,12 @@
 <%@ page import="java.util.TimeZone,java.util.Date" %>
 <tck:test testName="positiveTimezoneValueTest">
     <%
-        TimeZone tz = TimeZone.getTimeZone("PST");
+        TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
         pageContext.setAttribute("tz", tz);
         Date date = new Date(883192294202L);
         pageContext.setAttribute("dte", date);
     %>
-    <c:set var="mtz" value="PST"/>
+    <c:set var="mtz" value="America/Los_Angeles"/>
 
     <!-- Behavioral test of value attribute -->
     <!-- Timezone object -->