diff --git a/composer.json b/composer.json
index 82067afc3..aee73b504 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,20 @@
         "donatj/phpuseragentparser": "dev-master",
         "pimple/pimple": "~3.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.2"
+    },
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
         },
         "files": ["system/defines.php"]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Grav\\Test\\": "system/tests/Grav/Test/"
+        }
+    },
     "archive": {
         "exclude": ["VERSION"]
     },
diff --git a/system/tests/Grav/Test/.gitkeep b/system/tests/Grav/Test/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/system/tests/Grav/TestCase.php b/system/tests/Grav/TestCase.php
new file mode 100644
index 000000000..718bbadcb
--- /dev/null
+++ b/system/tests/Grav/TestCase.php
@@ -0,0 +1,8 @@
+<?php
+namespace Grav;
+
+
+class TestCase extends \PHPUnit_Framework_TestCase
+{
+
+}
diff --git a/system/tests/bootstrap.php b/system/tests/bootstrap.php
new file mode 100644
index 000000000..bc382eb86
--- /dev/null
+++ b/system/tests/bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+
+error_reporting(E_ALL);
+date_default_timezone_set(@date_default_timezone_get());
+require_once __DIR__.'/../../vendor/autoload.php';
+require_once __DIR__.'/Grav/TestCase.php';
diff --git a/system/tests/phpunit.xml b/system/tests/phpunit.xml
new file mode 100644
index 000000000..9eb7c6526
--- /dev/null
+++ b/system/tests/phpunit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="true"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="./bootstrap.php"
+    >
+    <testsuites>
+        <testsuite name="Full Grav Test Suite">
+            <directory>./Grav/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>