diff --git a/apps/portlet/src/main/resources/validators.xml b/apps/portlet/src/main/resources/validators.xml
index 4c06d8b10..a47094fe4 100644
--- a/apps/portlet/src/main/resources/validators.xml
+++ b/apps/portlet/src/main/resources/validators.xml
@@ -1,3 +1,6 @@
+<!DOCTYPE validators PUBLIC
+        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5636683e0..a7211edc9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -103,7 +103,7 @@
                                     <groupId>opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
-                                    <version>2.0.0</version>
+                                    <version>2.0.2-SNAPSHOT</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
diff --git a/core/pom.xml b/core/pom.xml
index 2c542a708..91a119d47 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,7 +35,7 @@
                                 <artifactItem>
                                     <groupId>opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
-                                    <version>2.0.1</version>
+                                    <version>2.0.2-SNAPSHOT</version>
                                     <classifier>sources</classifier>
                                 </artifactItem>
                             </artifactItems>
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
index ffe64fdda..e71fa6303 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
@@ -33,6 +33,8 @@ import com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.util.XWorkConverter;
+import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory;
 
 
 /**
@@ -54,8 +56,8 @@ public class HttpHeaderResultTest extends StrutsTestCase {
 
         Map values = new HashMap();
         values.put("bar", "abc");
-        ActionContext.getContext().getValueStack().push(values);
 
+        ActionContext.getContext().getValueStack().push(values);
         OgnlUtil.setProperties(params, result);
 
         responseMock.expect("addHeader", C.args(C.eq("foo"), C.eq("${bar}")));
@@ -72,8 +74,8 @@ public class HttpHeaderResultTest extends StrutsTestCase {
 
         Map values = new HashMap();
         values.put("bar", "abc");
-        ActionContext.getContext().getValueStack().push(values);
 
+        ActionContext.getContext().getValueStack().push(values);
         OgnlUtil.setProperties(params, result);
 
         responseMock.expect("addHeader", C.args(C.eq("foo"), C.eq("abc")));
@@ -96,11 +98,14 @@ public class HttpHeaderResultTest extends StrutsTestCase {
         response = (HttpServletResponse) responseMock.proxy();
         invocation = (ActionInvocation) new Mock(ActionInvocation.class).proxy();
         ServletActionContext.setResponse(response);
+
+        XWorkConverter.getInstance().setObjectTypeDeterminer(ObjectTypeDeterminerFactory.getInstance());
     }
 
     protected void tearDown() throws Exception {
         super.tearDown();
         ServletActionContext.setResponse(null);
         ActionContext.setContext(null);
+        XWorkConverter.resetInstance();
     }
 }
diff --git a/core/src/test/resources/validators.xml b/core/src/test/resources/validators.xml
index 4bd084264..a228118ab 100644
--- a/core/src/test/resources/validators.xml
+++ b/core/src/test/resources/validators.xml
@@ -1,3 +1,6 @@
+<!DOCTYPE validators PUBLIC
+        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>