diff --git a/.travis.yml b/.travis.yml
index 2e03c32..8d951b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 os: linux
+dist: trusty
 
 language: php
 
@@ -8,7 +9,12 @@ addons:
       - apache2
       - libapache2-mod-fastcgi
 
-dist: trusty
+before_script: make before_script
+
+script: make test
+
+stages:
+  - test
 
 jobs:
   include:
@@ -67,10 +73,6 @@ jobs:
       env: BRANCH=1.7.5.x
       after_success: bash <(curl -s https://codecov.io/bash)
 
-before_script: make before_script
-
-script: phpunit
-
 #deploy:
 #  skip_cleanup: true
 #  provider: script
diff --git a/Makefile b/Makefile
index 82aa8f4..95b3f69 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
 
 test:
 ifeq ($(COMPOSER_IN_TESTS),1)
-	phpunit
+	phpunit -c phpunit.xml.dist
 else
 	cd $(PRESTASHOP_DIR) && composer run-script create-test-db --timeout=0
 	cd $(PRESTASHOP_DIR) && php vendor/bin/phpunit -c $(ROOT_DIR)/phpunit.xml.dist