diff --git a/Makefile b/Makefile
index 067945e..93e8f12 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,10 @@ delete_archive:
 
 composer: clone_prestashop
 ifeq ($(COMPOSER_IN_TESTS),1)
-	@cd $(ROOT_DIR)/../PrestaShop/tests && composer install
+	@cd $(PRESTASHOP_DIR) && git checkout $(BRANCH)
+	@cd $(PRESTASHOP_DIR)/tests && composer install
 else
-	@cd $(ROOT_DIR)/../PrestaShop && composer install --prefer-dist --no-interaction --no-progress
+	@cd $(PRESTASHOP_DIR) && composer install --prefer-dist --no-interaction --no-progress
 endif
 
 clone_prestashop:
diff --git a/tests/bin/before_script.sh b/tests/bin/before_script.sh
deleted file mode 100644
index 0c5dacd..0000000
--- a/tests/bin/before_script.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z $TRAVIS_BUILD_DIR ]; then
-	exit 0;
-fi
-
-PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
-
-cd $PRESTASHOP_DIR
-
-if [ -z $BRANCH ]; then
-	if [ -f "tests/parameters.yml.travis" ]; then
-	    cp tests/parameters.yml.travis app/config/parameters.yml
-    else
-        cp tests-legacy/parameters.yml.travis app/config/parameters.yml
-    fi
-
-    bash travis-scripts/install-prestashop
-else
-    bash travis-scripts/install-prestashop.sh
-fi
diff --git a/tests/bin/clone_prestashop.sh b/tests/bin/clone_prestashop.sh
deleted file mode 100644
index fde2403..0000000
--- a/tests/bin/clone_prestashop.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z $TRAVIS_BUILD_DIR ]; then
-	exit 0;
-fi
-
-PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
-
-cd ..
-git clone https://github.com/PrestaShop/PrestaShop
-cd PrestaShop
-
-if ! [ -z $BRANCH ]; then
-    git checkout $BRANCH;
-    cd tests
-    composer install
-else
-    composer install --prefer-dist --no-interaction --no-progress
-fi
diff --git a/tests/bin/script.sh b/tests/bin/script.sh
deleted file mode 100644
index a104a9e..0000000
--- a/tests/bin/script.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z $TRAVIS_BUILD_DIR ]; then
-	exit 0;
-fi
-
-PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
-
-if ! [ -z $BRANCH ]; then
-    phpunit
-else
-    cd $PRESTASHOP_DIR
-    composer run-script create-test-db --timeout=0
-    php ../PrestaShop/vendor/bin/phpunit -c $TRAVIS_BUILD_DIR/phpunit.xml.dist
-fi
diff --git a/tests/bin/setup-apache.sh b/tests/bin/setup-apache.sh
deleted file mode 100755
index 42e93c2..0000000
--- a/tests/bin/setup-apache.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
-
-cd $PRESTASHOP_DIR
-
-bash travis-scripts/setup-php-fpm.sh
-
-echo "* Preparing Apache ...";
-
-sudo a2enmod rewrite actions fastcgi alias
-
-# Use default config
-sudo cp -f 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