diff --git a/core/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl
index a8048a21b..6a87214a0 100644
--- a/core/src/main/resources/template/simple/actionerror.ftl
+++ b/core/src/main/resources/template/simple/actionerror.ftl
@@ -21,9 +21,7 @@
  */
 -->
 <#if (actionErrors?? && actionErrors?size > 0)>
-	<ul>
-	<#list actionErrors as error>
-		<li><span<#rt/>
+	<ul<#rt/>
 <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
 <#else>
@@ -32,7 +30,9 @@
 <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
->${error!}</span></li>
+>
+	<#list actionErrors as error>
+		<li><span>${error!}</span></li>
 	</#list>
 	</ul>
 </#if>
\ No newline at end of file
diff --git a/core/src/main/resources/template/simple/actionmessage.ftl b/core/src/main/resources/template/simple/actionmessage.ftl
index cfb36814a..e574a9b13 100644
--- a/core/src/main/resources/template/simple/actionmessage.ftl
+++ b/core/src/main/resources/template/simple/actionmessage.ftl
@@ -21,9 +21,7 @@
  */
 -->
 <#if (actionMessages?? && actionMessages?size > 0)>
-	<ul>
-		<#list actionMessages as message>
-			<li><span<#rt/>
+	<ul<#rt/>
 <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
 <#else>
@@ -32,7 +30,9 @@
 <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
->${message!}</span></li>
+>
+		<#list actionMessages as message>
+			<li><span>${message!}</span></li>
 		</#list>
 	</ul>
 </#if>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
index 0259941f7..50be5751f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
@@ -1,5 +1,5 @@
-<ul>
-	<li><span class="errorMessage">action error number 1</span></li>
-	<li><span class="errorMessage">action error number 2</span></li>
-	<li><span class="errorMessage">action error number 3</span></li>
+<ul class="errorMessage">
+	<li><span>action error number 1</span></li>
+	<li><span>action error number 2</span></li>
+	<li><span>action error number 3</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
index 12412e0e0..3f98727c0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
@@ -1,5 +1,5 @@
-<ul>
-	<li><span class="actionMessage">action message number 1</span></li>
-	<li><span class="actionMessage">action message number 2</span></li>
-	<li><span class="actionMessage">action message number 3</span></li>
+<ul class="actionMessage">
+	<li><span>action message number 1</span></li>
+	<li><span>action message number 2</span></li>
+	<li><span>action message number 3</span></li>
 </ul>