diff --git a/Makefile b/Makefile
index de4750c..a98b07d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,7 @@
+all: vendor
+
+vendor:
+	composer install
+
 test:
-	phpunit tests/coreTest
+	vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 8f2bcb2..c5376e1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,28 +1,31 @@
 {
     "name": "keruald/globalfunctions",
     "description": "Essential core global functions",
     "type": "library",
     "license": "BSD-2-Clause",
     "version": "0.5.1",
     "repositories": [
         {
             "type": "vcs",
             "url": "https://github.com/keruald/globalfunctions"
         }
     ],
     "keywords": [
         "keruald",
         "core",
         "global functions"
     ],
     "require": {
         "php": ">=5.4.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^7"
+    },
     "autoload": {
         "files": ["core.php"]
     },
     "support": {
             "irc": "irc://irc.freenode.net/wolfplex",
             "issues": "http://devcentral.nasqueron.org"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..f9d5a18
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="false">
+    <php>
+        <ini name="display_errors" value="On" />
+        <ini name="display_startup_errors" value="On" />
+        <ini name="error_reporting" value="On" />
+    </php>
+    <testsuites>
+        <testsuite name="Unit tests">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <file>core.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/tests/coreTest.php b/tests/coreTest.php
index fa9afe1..1cb7133 100644
--- a/tests/coreTest.php
+++ b/tests/coreTest.php
@@ -1,162 +1,160 @@
 <?php
 
 namespace Keruald;
 
-require 'core.php';
-
 class CoreTest extends \PHPUnit\Framework\TestCase {
 
     ///
     /// Strings
     ///
 
     /**
      * @covers ::mb_str_pad
      */
     function test_mb_str_pad () {
         // Tests from http://3v4l.org/UnXTF
         // http://web.archive.org/web/20150711100913/http://3v4l.org/UnXTF
 
         $this->assertEquals('àèòàFOOàèòà', mb_str_pad("FOO", 11, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('àèòFOOàèòà', mb_str_pad("FOO", 10, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('àèòBAAZàèòà', mb_str_pad("BAAZ", 11, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('àèòBAAZàèò', mb_str_pad("BAAZ", 10, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 6, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 1, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 0, "àèò", STR_PAD_BOTH, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", -10, "àèò", STR_PAD_BOTH, "UTF-8"));
 
         $this->assertEquals('àèòàèòàèFOO', mb_str_pad("FOO", 11, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('àèòàèòàFOO', mb_str_pad("FOO", 10, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('àèòàèòàBAAZ', mb_str_pad("BAAZ", 11, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('àèòàèòBAAZ', mb_str_pad("BAAZ", 10, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 6, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 1, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 0, "àèò", STR_PAD_LEFT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", -10, "àèò", STR_PAD_LEFT, "UTF-8"));
 
         $this->assertEquals('FOOàèòàèòàè', mb_str_pad("FOO", 11, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('FOOàèòàèòà', mb_str_pad("FOO", 10, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('BAAZàèòàèòà', mb_str_pad("BAAZ", 11, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('BAAZàèòàèò', mb_str_pad("BAAZ", 10, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 6, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 1, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", 0, "àèò", STR_PAD_RIGHT, "UTF-8"));
         $this->assertEquals('FOOBAR', mb_str_pad("FOOBAR", -10, "àèò", STR_PAD_RIGHT, "UTF-8"));
     }
 
     /**
      * @covers ::is_ip
      */
     function test_is_ip () {
         $this->assertTrue(is_ip("0.0.0.0"));
         $this->assertFalse(is_ip(""));
         $this->assertFalse(is_ip("1"));
         $this->assertFalse(is_ip("17.17"));
         $this->assertTrue(is_ip("17.17.17.17"));
         $this->assertFalse(is_ip("17.17.17.256"));
         $this->assertTrue(is_ip("fe80:0000:0000:0000:0204:61ff:fe9d:f156"));
     }
 
     /**
      * @covers ::is_ipv4
      */
     function test_is_ipv4 () {
         $this->assertTrue(is_ipv4("0.0.0.0"));
         $this->assertFalse(is_ipv4(""));
         $this->assertFalse(is_ipv4("1"));
         $this->assertFalse(is_ipv4("17.17"));
         $this->assertTrue(is_ipv4("17.17.17.17"));
         $this->assertFalse(is_ipv4("17.17.17.256"));
         $this->assertFalse(is_ipv4(""));
         $this->assertFalse(is_ipv4("fe80:0000:0000:0000:0204:61ff:fe9d:f156"));
     }
 
     /**
      * @covers ::is_ipv6
      */
     function test_is_ipv6 () {
         $this->assertFalse(is_ipv6("0.0.0.0"));
         $this->assertFalse(is_ipv6(""));
         $this->assertFalse(is_ipv6("1"));
         $this->assertFalse(is_ipv6("17.17"));
         $this->assertFalse(is_ipv6("17.17.17.17"));
         $this->assertTrue(is_ipv6("::1"));
         $this->assertFalse(is_ipv6("::fg"));
         $this->assertTrue(is_ipv6("::1"));
 
         //Advanced IPv6 tests curated by Stephen Ryan
         //Source: http://forums.dartware.com/viewtopic.php?t=452
         $this->assertTrue(is_ipv6("fe80:0000:0000:0000:0204:61ff:fe9d:f156"));
         $this->assertFalse(is_ipv6("02001:0000:1234:0000:0000:C1C0:ABCD:0876"), "extra 0 not allowed");
         $this->assertFalse(is_ipv6("2001:0000:1234:0000:00001:C1C0:ABCD:0876"), "extra 0 not allowed");
         $this->assertFalse(is_ipv6("1.2.3.4:1111:2222:3333:4444::5555"));
         $this->assertTrue(is_ipv6("::ffff:192.0.2.128"), "can't validate IPv4 represented as dotted-quads");
     }
 
     ///
     /// Identifiers
     ///
 
     /**
      * @covers ::uuid
      */
     function test_uuid () {
         $uuid = uuid();
         $this->assertEquals(36, strlen($uuid));
         for ($i = 0 ; $i < 36 ; $i++) {
             if ($i == 8 | $i == 13 || $i == 18 || $i == 23) {
                 $this->assertEquals("-", $uuid[$i], "Dash were expected.");
                 continue;
             }
 
             $this->assertRegExp('/[0-9a-f]/', $uuid[$i], "Lowercase hexadecimal digit were expected.");
         }
     }
 
     ///
     /// Client information
     ///
 
     /**
      * @covers ::extract_client_ip_from_header
      */
     function test_extract_client_ip_from_header () {
         $values = [
             //Each value should return 10.0.0.3
             '10.0.0.3',
             '10.0.0.3,10.0.0.4',
             '10.0.0.3, 10.0.0.4',
             '10.0.0.3, 10.0.0.4, lorem ipsum dolor',
         ];
         foreach ($values as $value) {
             $this->assertEquals(
                 '10.0.0.3',
                 extract_client_ip_from_header($value)
             );
         }
 
         $this->assertEmpty(
             extract_client_ip_from_header('')
         );
     }
 
     /**
      * @covers ::get_remote_addr
      * @backupGlobals enabled
      */
     function test_get_remote_addr () {
         $this->assertEmpty(get_remote_addr());
 
         $_SERVER = [
             'REMOTE_ADDR' => '10.0.0.2'
         ];
         $this->assertEquals('10.0.0.2', get_remote_addr());
 
         $_SERVER += [
             'HTTP_X_FORWARDED_FOR' => '10.0.0.3',
             'HTTP_CLIENT_IP' => '10.0.0.4',
         ];
         $this->assertEquals('10.0.0.3', get_remote_addr(), "HTTP_X_FORWARDED_FOR must be prioritized.");
     }
 }