diff --git a/.gitignore b/.gitignore
index 735ca31..bc4fe0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,24 +23,12 @@
 /.phing/properties
 
 
-# ----------------------------------------------------------------------------------------------------------------------
-### PHPUnit
-# ----------------------------------------------------------------------------------------------------------------------
-/phpunit.xml
-
-
 # ----------------------------------------------------------------------------------------------------------------------
 ### PHP Coding Standards Fixer generated files
 # ----------------------------------------------------------------------------------------------------------------------
 /.php_cs.cache
 
 
-# ----------------------------------------------------------------------------------------------------------------------
-### Build files
-# ----------------------------------------------------------------------------------------------------------------------
-/.build/
-
-
 # ----------------------------------------------------------------------------------------------------------------------
 ### Generated databases
 # ----------------------------------------------------------------------------------------------------------------------
diff --git a/.phing/properties.dist b/.phing/properties.dist
index b515716..e939825 100644
--- a/.phing/properties.dist
+++ b/.phing/properties.dist
@@ -76,7 +76,6 @@ dir.tests = ${project.basedir}/tests
 dir.build = ${project.basedir}/.build
 dir.reports = ${dir.build}/logs
 dir.reports.pdepend = ${dir.reports}/pdepend
-dir.reports.coverage = ${dir.reports}/phpunit_coverage
 #
 # Disabled, because unnecessary right now
 # phpdocumentor/phpdocumentor cannot be installed via Composer
@@ -97,9 +96,9 @@ dir.data.temporary = ${dir.data}/tmp
 # Testing
 # --------------------------------------------------------------------------------
 
-# Path of the PHPUnit
+# Path of the framework used to run unit tests
 #
-phpUnit.path = ./vendor/bin/phpunit
+tests_framework.path = ./vendor/bin/codecept
 
 # Path of the PHP Coding Standards Fixer (http://cs.sensiolabs.org)
 #
diff --git a/.phing/tests.xml b/.phing/tests.xml
index 5cdd1da..243cb2e 100644
--- a/.phing/tests.xml
+++ b/.phing/tests.xml
@@ -87,7 +87,7 @@
 
     <!-- Test target -->
     <target name="build:test"
-            depends="test:phpunit"
+            depends="test:unit"
             description="Executes all tests" />
 
     <!-- Project build clean -->
@@ -103,7 +103,6 @@
         <!--<mkdir dir="${dir.docs}" />-->
         <!--<mkdir dir="${dir.docs.phpdoc2}" />-->
         <mkdir dir="${dir.reports}" />
-        <mkdir dir="${dir.reports.coverage}" />
         <mkdir dir="${dir.reports.pdepend}" />
     </target>
 
@@ -212,10 +211,9 @@
     </target>
 
     <!-- Unit tests -->
-    <target name="test:phpunit" description="Executes PHPUnit tests">
+    <target name="test:unit" description="Executes unit tests">
         <echo msg="Running unit tests..." />
-        <exec command="${phpUnit.path} --verbose --no-coverage --configuration ${project.basedir}/phpunit.xml.dist"
-              passthru="true"/>
+        <exec command="${tests_framework.path} run --silent" passthru="true"/>
     </target>
 
     <!-- Checkout and finalization -->
diff --git a/codeception.yml b/codeception.yml
new file mode 100644
index 0000000..1883ff0
--- /dev/null
+++ b/codeception.yml
@@ -0,0 +1,22 @@
+namespace: 'Meritoo\Common\Test'
+suites:
+    unit:
+        path: .
+settings:
+    shuffle: true
+    lint: true
+paths:
+    tests: tests
+    output: tests/_output
+    support: tests/_support
+    data: tests
+coverage:
+    enabled: true
+    include:
+        - src/*
+    exclude:
+        - .data/*
+        - .docker/*
+        - .phing/*
+        - tests/*
+        - vendor/*
diff --git a/composer.json b/composer.json
index 10278cf..1dfe52a 100644
--- a/composer.json
+++ b/composer.json
@@ -17,11 +17,11 @@
         "symfony/http-foundation": "^3.3"
     },
     "require-dev": {
+        "codeception/codeception": "^2.4",
         "friendsofphp/php-cs-fixer": "^2.2",
         "pdepend/pdepend": "^2.5",
         "phploc/phploc": "^2.1",
         "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "^4.8",
         "sebastian/phpcpd": "^2.0",
         "squizlabs/php_codesniffer": "^2.9"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index ffd8beb..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
-        backupGlobals="true"
-        backupStaticAttributes="false"
-        bootstrap="./vendor/autoload.php"
-        cacheTokens="false"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        forceCoversAnnotation="false"
-        mapTestClassNameToCoveredClassName="false"
-        printerClass="PHPUnit_TextUI_ResultPrinter"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        stopOnRisky="false"
-        testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-        timeoutForSmallTests="1"
-        timeoutForMediumTests="10"
-        timeoutForLargeTests="60"
-        verbose="true"
->
-    <php>
-        <ini name="error_reporting" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="Meritoo Package - Main Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-
-    <logging>
-        <log type="coverage-html" target="./.build/logs/phpunit_coverage/html"/>
-    </logging>
-</phpunit>
diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore
new file mode 100644
index 0000000..c96a04f
--- /dev/null
+++ b/tests/_output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/_support/.gitkeep b/tests/_support/.gitkeep
new file mode 100644
index 0000000..e69de29