diff --git a/package.xml b/package.xml
index 312ee067..27d42ad7 100644
--- a/package.xml
+++ b/package.xml
@@ -42,8 +42,8 @@
                 <file name="zephir.h" role="src"/>
             </dir>
 
-            <div name="tests">
-                <div name="base">
+            <dir name="tests">
+                <dir name="base">
                     <file name="cblocks.phpt" role="test"/>
                     <file name="declare.phpt" role="test"/>
                     <file name="empty01.phpt" role="test"/>
@@ -52,9 +52,9 @@
                     <file name="literals.phpt" role="test"/>
                     <file name="types.phpt" role="test"/>
                     <file name="variables.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="cf">
+                <dir name="cf">
                     <file name="do-while.phpt" role="test"/>
                     <file name="for.phpt" role="test"/>
                     <file name="if.phpt" role="test"/>
@@ -64,79 +64,79 @@
                     <file name="try-catch02.phpt" role="test"/>
                     <file name="try-catch03.phpt" role="test"/>
                     <file name="while01.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="classes">
+                <dir name="classes">
                     <file name="bug48.phpt" role="test"/>
                     <file name="constant.phpt" role="test"/>
                     <file name="interface.phpt" role="test"/>
                     <file name="method-visibility.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="comments">
-                    <div name="dockblocks">
+                <dir name="comments">
+                    <dir name="dockblocks">
                         <file name="bug13.phpt" role="test"/>
                         <file name="empty.phpt" role="test"/>
                         <file name="simple.phpt" role="test"/>
-                    </div>
+                    </dir>
 
                     <file name="comment.phpt" role="test"/>
                     <file name="comments_before.phpt" role="test"/>
                     <file name="empty.phpt" role="test"/>
                     <file name="sl_comment.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="errors">
+                <dir name="errors">
                     <file name="001.phpt" role="test"/>
                     <file name="bug30.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="functions">
-                    <div name="closures">
+                <dir name="functions">
+                    <dir name="closures">
                         <file name="closure_arrow.phpt" role="test"/>
                         <file name="empty_closure.phpt" role="test"/>
                         <file name="empty_closure_with_body.phpt" role="test"/>
                         <file name="non_empty_closure_with_use.phpt" role="test"/>
                         <file name="non_empty_closure_with_use_and_body.phpt" role="test"/>
                         <file name="preg_replace_callback.phpt" role="test"/>
-                    </div>
+                    </dir>
 
-                    <div name="parameter-types">
+                    <dir name="parameter-types">
                         <file name="int.phpt" role="test"/>
                         <file name="mixed.phpt" role="test"/>
-                    </div>
+                    </dir>
 
-                    <div name="return-types">
+                    <dir name="return-types">
                         <file name="int.phpt" role="test"/>
                         <file name="mixed.phpt" role="test"/>
-                    </div>
+                    </dir>
 
                     <file name="definition01.phpt" role="test"/>
                     <file name="definition02.phpt" role="test"/>
                     <file name="definition03.phpt" role="test"/>
                     <file name="definition04.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="globals">
+                <dir name="globals">
                     <file name="001.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="namespaces">
+                <dir name="namespaces">
                     <file name="001.phpt" role="test"/>
                     <file name="002.phpt" role="test"/>
                     <file name="003.phpt" role="test"/>
                     <file name="004.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="operators">
-                    <div name="assignments">
+                <dir name="operators">
+                    <dir name="assignments">
                         <file name="bitwise.phpt" role="test"/>
                         <file name="concat.phpt" role="test"/>
                         <file name="div.phpt" role="test"/>
                         <file name="mod.phpt" role="test"/>
                         <file name="mul.phpt" role="test"/>
                         <file name="sub.phpt" role="test"/>
-                    </div>
+                    </dir>
 
                     <file name="and.phpt" role="test"/>
                     <file name="bitwise.phpt" role="test"/>
@@ -163,17 +163,17 @@
                     <file name="static-property-access.phpt" role="test"/>
                     <file name="sub.phpt" role="test"/>
                     <file name="ternary.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="statements">
-                    <div name="yield">
+                <dir name="statements">
+                    <dir name="yield">
                         <file name="empty-yield.phpt" role="test"/>
                         <file name="yield-array.phpt" role="test"/>
                         <file name="yield-closure.phpt" role="test"/>
                         <file name="yield-key-value.phpt" role="test"/>
                         <file name="yield-key-value-variables.phpt" role="test"/>
                         <file name="yield-value.phpt" role="test"/>
-                    </div>
+                    </dir>
 
                     <file name="break.phpt" role="test"/>
                     <file name="continue.phpt" role="test"/>
@@ -187,16 +187,16 @@
                     <file name="scall.phpt" role="test"/>
                     <file name="throw.phpt" role="test"/>
                     <file name="unset.phpt" role="test"/>
-                </div>
+                </dir>
 
-                <div name="unicode">
+                <dir name="unicode">
                     <file name="bug56.phpt" role="test"/>
                     <file name="bug62.phpt" role="test"/>
-                </div>
+                </dir>
 
                 <file name="skipif.inc" role="test"/>
                 <file name="skipifwin32.inc" role="test"/>
-            </div>
+            </dir>
 
             <file name="config.m4" role="src"/>
             <file name="config.w32" role="src"/>