diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
index 3b1b9717bb369..453c008c0a922 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
@@ -281,7 +281,7 @@ public Object[][] getContents()
               + "To enable extension functions, set ''jdk.xml.enableExtensionFunctions'' to ''true''."},
 
         {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
-        "Use of the extension function ''{0}'' is not allowed when extension "
+        "Use of the extension element ''{0}'' is not allowed when extension "
               + "functions are disabled by the secure processing feature or "
               + "the property ''jdk.xml.enableExtensionFunctions''. "
               + "To enable extension functions, set ''jdk.xml.enableExtensionFunctions'' to ''true''."},
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
index 8f95cb90f82b3..bc12f14dd0940 100644
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
+++ b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
@@ -61,15 +61,9 @@
  * This is an interface provide basic support for JAXP functional test.
  */
 public class JAXPTestUtilities {
-    public static String CLS_DIR = System.getProperty("test.classes");
-    public static String SRC_DIR = System.getProperty("test.src");
-    public static boolean isWindows = false;
-    static {
-        if (System.getProperty("os.name").contains("Windows")) {
-            isWindows = true;
-        }
-    };
-
+    public static final String CLS_DIR = System.getProperty("test.classes");
+    public static final String SRC_DIR = System.getProperty("test.src");
+    public static final boolean isWindows = System.getProperty("os.name").contains("Windows");
     /**
      * Prefix for error message.
      */