diff --git a/.coveralls.yml b/.coveralls.yml
index 0c0823360..b086fff7a 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,4 +1,4 @@
 # for php-coveralls
 service_name: travis-ci
 src_dir: lib
-coverage_clover: build/logs/clover.xml
+coverage_clover: build/logs/clover*.xml
diff --git a/.travis.yml b/.travis.yml
index 8a13f9551..7894ea3a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,9 @@ php:
   - hhvm
 
 env:
-  - DB=mysql ENABLE_SECOND_LEVEL_CACHE=1
-  - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1
-  - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=1
-  - DB=mysql ENABLE_SECOND_LEVEL_CACHE=0
-  - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0
-  - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=0
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
 
 before_script:
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS doctrine_tests;' -U postgres; fi"
@@ -22,7 +19,9 @@ before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi"
   - composer install --prefer-source --dev
 
-script: phpunit -v --configuration tests/travis/$DB.travis.xml
+script: 
+  - ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --coverage-clover ./build/logs/clover.xml
+  - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --coverage-clover ./build/logs/clover-slc.xml --exclude-group performance,non-cacheable,locking_functional
 
 after_script:
   - php vendor/bin/coveralls -v
@@ -32,11 +31,6 @@ matrix:
     - php: hhvm
   exclude:
     - php: hhvm
-      env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0  # driver currently unsupported by HHVM
+      env: DB=pgsql  # driver currently unsupported by HHVM
     - php: hhvm
-      env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 # driver currently unsupported by HHVM
-    - php: hhvm
-      env: DB=mysqli ENABLE_SECOND_LEVEL_CACHE=0  # driver currently unsupported by HHVM
-    - php: hhvm
-      env: DB=mysqli ENABLE_SECOND_LEVEL_CACHE=1 # driver currently unsupported by HHVM
-
+      env: DB=mysqli # driver currently unsupported by HHVM
diff --git a/composer.json b/composer.json
index 4b0d449f0..1e7ad2ec8 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
         "symfony/console": "2.*"
     },
     "require-dev": {
-        "symfony/yaml": "2.1",
+        "symfony/yaml": "~2.1",
+        "phpunit/phpunit": "~3.7",
         "satooshi/php-coveralls": "dev-master"
     },
     "suggest": {
diff --git a/tests/travis/mysql.travis.xml b/tests/travis/mysql.travis.xml
index e278e8859..8319d1466 100644
--- a/tests/travis/mysql.travis.xml
+++ b/tests/travis/mysql.travis.xml
@@ -16,10 +16,6 @@
         <var name="tmpdb_port" value="3306"/>
     </php>
 
-    <logging>
-        <log type="coverage-clover" target="../../build/logs/clover.xml"/>
-    </logging>
-
     <testsuites>
         <testsuite name="Doctrine ORM Test Suite">
             <directory>./../Doctrine/Tests/ORM</directory>
@@ -33,7 +29,6 @@
     <groups>
         <exclude>
             <group>performance</group>
-            <group>non-cacheable</group>
             <group>locking_functional</group>
         </exclude>
     </groups>
diff --git a/tests/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml
index a2993fcb1..75c831dd1 100644
--- a/tests/travis/pgsql.travis.xml
+++ b/tests/travis/pgsql.travis.xml
@@ -19,10 +19,6 @@
         <var name="tmpdb_port" value="5432"/>
     </php>
 
-    <logging>
-        <log type="coverage-clover" target="../../build/logs/clover.xml"/>
-    </logging>
-
     <testsuites>
         <testsuite name="Doctrine ORM Test Suite">
             <directory>./../Doctrine/Tests/ORM</directory>
@@ -36,7 +32,6 @@
     <groups>
         <exclude>
             <group>performance</group>
-            <group>non-cacheable</group>
             <group>locking_functional</group>
         </exclude>
     </groups>
diff --git a/tests/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml
index 242d4dea8..5233adeb6 100644
--- a/tests/travis/sqlite.travis.xml
+++ b/tests/travis/sqlite.travis.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit bootstrap="../Doctrine/Tests/TestInit.php">
 
-    <logging>
-        <log type="coverage-clover" target="../../build/logs/clover.xml"/>
-    </logging>
-
    <testsuites>
      <testsuite name="Doctrine ORM Test Suite">
         <directory>./../Doctrine/Tests/ORM</directory>
@@ -18,7 +14,6 @@
     <groups>
       <exclude>
          <group>performance</group>
-         <group>non-cacheable</group>
          <group>locking_functional</group>
       </exclude>
     </groups>