diff --git a/.gitignore b/.gitignore
index 41f1fd93f..133f00587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Created by .gitignore support plugin (hsz.mobi)
 
 vendor/
-.idea
\ No newline at end of file
+.idea
+build/
diff --git a/composer.json b/composer.json
index a70a560bd..eebde4a54 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,12 @@
     },
     "autoload": {
         "psr-4" : {
-            "Leaseweb\\InfluxDB": "src/Leaseweb/InfluxDB"
+            "Leaseweb\\InfluxDB\\": "src/Leaseweb/InfluxDB"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Leaseweb\\InfluxDB\\Test\\": "tests"
         }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 000000000..102011e1c
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Influxdb-php tests">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="tap" target="build/report.tap"/>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+</phpunit>
diff --git a/tests/unit/ResultSetTest.php b/tests/unit/ResultSetTest.php
new file mode 100644
index 000000000..2634a01ff
--- /dev/null
+++ b/tests/unit/ResultSetTest.php
@@ -0,0 +1,12 @@
+<?php
+namespace Leaseweb\InfluxDB\Test;
+
+class ResultSetTest extends \PHPUnit_Framework_TestCase
+{
+    public function testResultSetFromRaw()
+    {
+        $this->assertTrue(
+            false
+        );
+    }
+}
\ No newline at end of file