diff --git a/.travis.yml b/.travis.yml
index 9da900cd753f..94a69dc7696b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,14 +30,6 @@ before_install:
 
 install:
   # install Composer dependencies
-<<<<<<< HEAD
-  - travis_retry composer update --prefer-dist;
-
-before_script:
-  # copy configuration files
-  - cp tests/_bootstrap.php.default tests/_bootstrap.php
-  - cp tests/.env.circleci .env
-=======
   - rm composer.lock
   # these providers require referencing git commit's which cause Travis to fail
   - sed -i '/mollie/d' composer.json
@@ -53,11 +45,7 @@ before_script:
   - php artisan key:generate --no-interaction
   - sed -i 's/APP_ENV=production/APP_ENV=development/g' .env
   - sed -i 's/APP_DEBUG=false/APP_DEBUG=true/g' .env
-<<<<<<< HEAD
->>>>>>> upstream/develop
-=======
   - sed -i 's/REQUIRE_HTTPS=false/NINJA_DEV=true/g' .env
->>>>>>> upstream/develop
   # create the database and user
   - mysql -u root -e "create database IF NOT EXISTS ninja;"
   - mysql -u root -e "GRANT ALL PRIVILEGES ON ninja.* To 'ninja'@'localhost' IDENTIFIED BY 'ninja'; FLUSH PRIVILEGES;"
@@ -76,25 +64,22 @@ before_script:
 
 script:
   #- php ./vendor/codeception/codeception/codecept run --html --debug
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
   - php ./vendor/codeception/codeception/codecept run acceptance OnlinePaymentCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
   #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php
 
-<<<<<<< HEAD
-=======
 after_script:
   - cat storage/logs/laravel.log
 
->>>>>>> upstream/develop
 notifications:
   email:
     on_success: never