diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..178e313
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+phpunit.xml
+vendor
+composer.lock
+composer.phar
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ac80300
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+
+before_script:
+  - wget -nc http://getcomposer.org/composer.phar
+  - php composer.phar install
+
+script: phpunit --coverage-text
+
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
new file mode 100644
index 0000000..861c4e9
--- /dev/null
+++ b/Tests/bootstrap.php
@@ -0,0 +1,18 @@
+<?php
+
+if (file_exists($file = __DIR__.'/../vendor/.composer/autoload.php')) {
+    $loader = require_once $file;
+} else {
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
+
+spl_autoload_register(function($class) {
+    if (0 === strpos($class, 'FOQ\\ElasticaBundle\\')) {
+        $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
+        if (!stream_resolve_include_path($path)) {
+            return false;
+        }
+        require_once $path;
+        return true;
+    }
+});
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 65618cf..4ed054c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="../../../../app/bootstrap.php.cache"
->
-
+<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
     <testsuites>
-        <testsuite name="ElasticaBundle Test Suite">
-            <directory>./Tests/</directory>
+        <testsuite name="FOQElasticaBundle Test Suite">
+            <directory>./Tests</directory>
         </testsuite>
     </testsuites>
 
@@ -22,7 +11,9 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
+                <directory>./Resources</directory>
                 <directory>./Tests</directory>
+                <directory>./vendor</directory>
             </exclude>
         </whitelist>
     </filter>