diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index e64dc79a3..efb3596b5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -3,7 +3,7 @@
 <form id="testAction" name="myForm" onsubmit="submitMe(); return validateForm_testAction();" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="testAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index 8cd21021e..806a94e87 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index ab2a1ee58..710ad541a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
index afbd0491d..f512ff4d5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
index a9b92445c..01efdf18b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
@@ -4,7 +4,7 @@
         <td class="tdLabelTop" colspan="2"><label class="label">label:</label></td>
     </tr>
     <tr>
-        <td><input type="text" name=""/></td>
+        <td class="tdInput"><input type="text" name=""/></td>
     </tr>
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
index 3487b3370..2c62222d3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
@@ -1,7 +1,7 @@
 <form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="myAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
index 8949d2ad6..2f0974e93 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value=""></option>
     <option value="england" selected="selected">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
index 2cf75d1ee..b98ee464a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
index dc3cab5a8..593a7b9b2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
index c6cd2f0d0..a00d29403 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value="england">England</option>
     <option value="america" selected="selected">America</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
index de67ff76d..40d57d5c4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
 	<option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
index 3692648db..1237d1bd6 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
index 6019a1e14..6a87c2165 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
index 17473293a..2a8ccd6a3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
index a9bda3926..6d6fab994 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
index 45df86b4f..939b78401 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
index 7a7b723e8..bebbd9bb6 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
index 57bfbf69f..fc1633532 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>                                    
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" style="style" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" style="style" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
index e965d4322..8bdb4b6bf 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" style="errstyle" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" style="errstyle" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
index 67d52b247..c35c1ea62 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" class="errclass" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" class="errclass" title="mytitle"/></td>
 </tr>