diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
index 760bbc506..aded5fcf1 100644
--- a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
+++ b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
@@ -21,24 +21,21 @@
 
 package org.apache.struts2.codebehind;
 
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+
+import javax.servlet.ServletContext;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
 
-import javax.servlet.ServletContext;
-
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.config.NullResult;
-import org.apache.struts2.dispatcher.ServletDispatcherResult;
-
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
-
 public class CodebehindUnknownHandlerTest extends StrutsTestCase {
 
     CodebehindUnknownHandler handler;
diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
index 646f6b10c..1a84a97a0 100644
--- a/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
+++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
@@ -21,20 +21,15 @@
 
 package org.apache.struts2.config;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.struts2.dispatcher.ServletDispatcherResult;
-import org.apache.struts2.util.StrutsTestCaseHelper;
-
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
 import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-
 import junit.framework.TestCase;
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+
+import java.util.Map;
 
 public class ClasspathPackageProviderTest extends TestCase {