diff --git a/.travis.yml b/.travis.yml
index a0c7ff0..31f16bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ php:
   - 5.5
   - 5.6
   - hhvm
+env:
+  - CONFIGURATION_FILE=phpunit.xml
+  - CONFIGURATION_FILE=phpunit.integration.xml
 matrix:
   allow_failures:
     - php: hhvm
diff --git a/phpunit.integration.xml b/phpunit.integration.xml
new file mode 100644
index 0000000..3738b96
--- /dev/null
+++ b/phpunit.integration.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/bootstrap.php"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader">
+
+    <testsuites>
+        <testsuite name="All">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <logging>
+        <log type="junit" target="build/junit.xml" logIncompleteSkipped="false" />
+        <log type="coverage-html" target="build/coverage/" charset="UTF-8"
+             highlight="true" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="build/coverage/clover.xml"/>
+    </logging>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./lib</directory>
+            <exclude>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 8aec30d..d298fb2 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -17,9 +17,7 @@
 
     <groups>
         <exclude>
-            <group>
-                integration
-            </group>
+            <group>integration</group>
         </exclude>
     </groups>