diff --git a/.phing/properties.dist b/.phing/properties.dist
index db05a3a..99977a9 100644
--- a/.phing/properties.dist
+++ b/.phing/properties.dist
@@ -102,27 +102,7 @@ dir.data.temporary = ${dir.data}/tmp
 #
 tests.database = ${dir.data.temporary}/database.sqlite
 
-#
-# Disabled, because unnecessary right now
-# PHPUnit is installed and loaded by Composer
-#
-# Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
-# 2017-02-22
-#
-# Run PHPUnit using exec task instead of phpunitTask
-#phpunit.useExec = false
-
-#
-# Disabled, because unnecessary right now
-# We want generate code coverage always
-#
-# Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
-# 2017-02-22
-#
-# Collect coverage data during tests
-#phpunit.withCoverage = true
-
-# Path of the PHPUnit (https://phpunit.de)
+# Path of the PHPUnit
 #
 phpUnit.path = ./vendor/bin/phpunit
 
diff --git a/.phing/tests.xml b/.phing/tests.xml
index 4567626..3482177 100644
--- a/.phing/tests.xml
+++ b/.phing/tests.xml
@@ -235,71 +235,6 @@
             <fileset refid="sourcecode" />
         </coverage-setup>
         <exec command="${phpUnit.path} --verbose --configuration ${project.basedir}/phpunit.xml.dist" passthru="true" />
-        <!--
-        I have to use ExecTask to run PHPUnit instead of PHPUnitTask, because tests are not running if PHPUnitTask is
-        used (don't know why):
-        Total tests run: 0, Failures: 0, Errors: 0, Incomplete: 0, Skipped: 0
-
-        Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
-        2017-02-23
-
-        <phpunit configuration="${project.basedir}/phpunit.xml.dist" printsummary="true">
-            <formatter type="xml" todir="${dir.reports}" outfile="phpunit.xml" />
-            <formatter type="plain" todir="${dir.reports}" outfile="phpunit.txt" />
-            <formatter type="clover" todir="${dir.reports.coverage}" />
-            <formatter type="summary" todir="${dir.reports}" outfile="phpunit_summary.txt" />
-        </phpunit>
-        -->
-
-        <!--
-        Previous / old version
-
-        Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
-        2017-02-22
-
-        <if>
-            <istrue value="${phpunit.useExec}" />
-            <then>
-                <if>
-                    <istrue value="${phpunit.withCoverage}" />
-                    <then>
-                        <echo message="Running tests with code coverage..." />
-                        <exec command="phpunit \-\-log-junit ${dir.reports}/phpunit.xml \-\-coverage-clover ${dir.reports.coverage}/clover-coverage.xml \-\-coverage-crap4j ${dir.reports.coverage}/crap4j-coverage.xml \-\-coverage-html ${dir.reports.coverage}/ -c ${project.basedir} \-\-colors" passthru="true" checkreturn="true" />
-                    </then>
-                    <else>
-                        <echo message="Running tests without code coverage..." />
-                        <exec command="phpunit \-\-log-junit ${dir.reports}/phpunit.xml -c ${project.basedir} \-\-colors" passthru="true" checkreturn="true" />
-                    </else>
-                </if>
-            </then>
-            <else>
-                <if>
-                    <istrue value="${phpunit.withCoverage}" />
-                    <then>
-                        <echo message="Running tests with code coverage..." />
-                        <coverage-setup database="${dir.reports.coverage}/coverage.db">
-                            <fileset refid="sourcecode" />
-                        </coverage-setup>
-                        <phpunit printsummary="true" codecoverage="true">
-                            <formatter type="xml" todir="${dir.reports}" outfile="phpunit.xml" />
-                            <formatter type="plain" todir="${dir.reports}" outfile="phpunit.txt" />
-                            <formatter type="clover" todir="${dir.reports.coverage}" />
-                            <formatter type="summary" todir="${dir.reports}" outfile="phpunit_summary.txt" />
-                        </phpunit>
-                    </then>
-                    <else>
-                        <echo message="Running tests without code coverage..." />
-                        <phpunit printsummary="true">
-                            <formatter todir="${dir.reports}" type="xml" outfile="phpunit.xml" />
-                            <batchtest>
-                                <fileset refid="tests" />
-                            </batchtest>
-                        </phpunit>
-                    </else>
-                </if>
-            </else>
-        </if>
-        -->
     </target>
 
     <!-- Checkout and finalization -->