diff --git i/test/unit/lib/redmine/wiki_formatting/macros_test.rb w/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 41a7e6857..7f9500fed 100644
--- i/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ w/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -407,12 +407,12 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
 
   def test_macro_child_pages
     expected =
-      "<p><ul class=\"pages-hierarchy\">\n" \
+      "<div><ul class=\"pages-hierarchy\">\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a>\n" \
       "<ul class=\"pages-hierarchy\">\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_1_1\">Child 1 1</a></li>\n</ul>\n</li>\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" \
-      "</ul>\n</p>"
+      "</ul>\n</div>"
     @project = Project.find(1)
     with_settings :text_formatting => 'textile' do
       # child pages of the current wiki page
@@ -427,14 +427,14 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
 
   def test_macro_child_pages_with_parent_option
     expected =
-      "<p><ul class=\"pages-hierarchy\">\n" \
+      "<div><ul class=\"pages-hierarchy\">\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Another_page\">Another page</a>\n" \
       "<ul class=\"pages-hierarchy\">\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a>\n" \
       "<ul class=\"pages-hierarchy\">\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_1_1\">Child 1 1</a></li>\n</ul>\n</li>\n" \
       "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" \
-      "</ul>\n</li>\n</ul>\n</p>"
+      "</ul>\n</li>\n</ul>\n</div>"
 
     @project = Project.find(1)
     with_settings :text_formatting => 'textile' do
@@ -455,10 +455,10 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
 
   def test_macro_child_pages_with_depth_option
     expected =
-      "<p><ul class=\"pages-hierarchy\">\n" \
+      "<div><ul class=\"pages-hierarchy\">\n" \
         "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" \
         "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" \
-        "</ul>\n</p>"
+        "</ul>\n</div>"
     @project = Project.find(1)
     with_settings :text_formatting => 'textile' do
       assert_equal expected, textilizable("{{child_pages(depth=1)}}", :object => WikiPage.find(2).content)