diff --git a/.travis.yml b/.travis.yml
index c5ffe54..26b3e41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,55 @@ dist: trusty
 
 jobs:
   include:
+    - php: 5.6
+      env: BRANCH=1.6.1.18 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.18 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.18 COMPOSER_IN_TESTS=1
+
+    - php: 5.6
+      env: BRANCH=1.6.1.19 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.19 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.19 COMPOSER_IN_TESTS=1
+
+    - php: 5.6
+      env: BRANCH=1.6.1.20 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.20 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.20 COMPOSER_IN_TESTS=1
+
+    - php: 5.6
+      env: BRANCH=1.6.1.21 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.21 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.21 COMPOSER_IN_TESTS=1
+
+    - php: 5.6
+      env: BRANCH=1.6.1.22 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.22 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.22 COMPOSER_IN_TESTS=1
+
+    - php: 5.6
+      env: BRANCH=1.6.1.23 COMPOSER_IN_TESTS=1
+    - php: 7.0
+      env: BRANCH=1.6.1.23 COMPOSER_IN_TESTS=1
+    - php: 7.1
+      env: BRANCH=1.6.1.23 COMPOSER_IN_TESTS=1
+
     - php: 5.6
       env: BRANCH=1.6.1.24 COMPOSER_IN_TESTS=1
     - php: 7.0
       env: BRANCH=1.6.1.24 COMPOSER_IN_TESTS=1
     - php: 7.1
       env: BRANCH=1.6.1.24 COMPOSER_IN_TESTS=1
+
     - php: 7.1
       env: BRANCH=1.7.5.x
     - php: 7.2
diff --git a/Makefile b/Makefile
index b073c5e..82aa8f4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,35 +27,35 @@ else
 endif
 
 clone_prestashop:
-	@cd $(ROOT_DIR)/../ && git clone https://github.com/PrestaShop/PrestaShop
+	cd $(ROOT_DIR)/../ && git clone https://github.com/PrestaShop/PrestaShop
 
 setup_apache: composer
-	@bash $(PRESTASHOP_DIR)/travis-scripts/setup-php-fpm.sh
-	@echo "* Preparing Apache ..."
-	@sudo a2enmod rewrite actions fastcgi alias
+	bash $(PRESTASHOP_DIR)/travis-scripts/setup-php-fpm.sh
+	echo "* Preparing Apache ..."
+	sudo a2enmod rewrite actions fastcgi alias
     # Use default config
-	@sudo cp -f $(PRESTASHOP_DIR)/tests/travis-ci-apache-vhost /etc/apache2/sites-available/000-default.conf
-	@sudo sed -e "s?%PRESTASHOP_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-	@sudo chmod 777 -R $(HOME)
+	sudo cp -f $(PRESTASHOP_DIR)/tests/travis-ci-apache-vhost /etc/apache2/sites-available/000-default.conf
+	sudo sed -e "s?%PRESTASHOP_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+	sudo chmod 777 -R $(HOME)
     # Starting Apache
-	@sudo service apache2 restart
+	sudo service apache2 restart
 
 before_script: setup_apache
 ifneq ($(COMPOSER_IN_TESTS),1)
     ifeq ("$(wildcard $(PRESTASHOP_DIR)/tests/parameters.yml.travis)","")
-		@cd $(PRESTASHOP_DIR) && cp tests/parameters.yml.travis app/config/parameters.yml
+		cd $(PRESTASHOP_DIR) && cp tests/parameters.yml.travis app/config/parameters.yml
     else
-		@cd $(PRESTASHOP_DIR) && cp tests-legacy/parameters.yml.travis app/config/parameters.yml
+		cd $(PRESTASHOP_DIR) && cp tests-legacy/parameters.yml.travis app/config/parameters.yml
     endif
-	@cd $(PRESTASHOP_DIR) && bash travis-scripts/install-prestashop
+	cd $(PRESTASHOP_DIR) && bash travis-scripts/install-prestashop
 else
-	@cd $(PRESTASHOP_DIR) && bash travis-scripts/install-prestashop.sh
+	cd $(PRESTASHOP_DIR) && bash travis-scripts/install-prestashop.sh
 endif
 
 test:
 ifeq ($(COMPOSER_IN_TESTS),1)
-	@phpunit
+	phpunit
 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
+	cd $(PRESTASHOP_DIR) && composer run-script create-test-db --timeout=0
+	cd $(PRESTASHOP_DIR) && php vendor/bin/phpunit -c $(ROOT_DIR)/phpunit.xml.dist
 endif