diff --git a/.travis.yml b/.travis.yml
index e251069..3176a1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,112 +168,112 @@ jobs:
     - php: 7.1
       env: BRANCH=2.2.0
     - php: 7.2
-      env: BRANCH=2.2.1 USE_COMPOSER=1
+      env: BRANCH=2.2.1
 
     - php: 7.0
       env: BRANCH=2.2.1
     - php: 7.1
       env: BRANCH=2.2.1
     - php: 7.2
-      env: BRANCH=2.2.1 USE_COMPOSER=1
+      env: BRANCH=2.2.1
 
     - php: 7.0
       env: BRANCH=2.2.2
     - php: 7.1
       env: BRANCH=2.2.2
     - php: 7.2
-      env: BRANCH=2.2.2 USE_COMPOSER=1
+      env: BRANCH=2.2.2
 
     - php: 7.0
       env: BRANCH=2.2.3
     - php: 7.1
       env: BRANCH=2.2.3
     - php: 7.2
-      env: BRANCH=2.2.3 USE_COMPOSER=1
+      env: BRANCH=2.2.3
 
     - php: 7.0
       env: BRANCH=2.2.4
     - php: 7.1
       env: BRANCH=2.2.4
     - php: 7.2
-      env: BRANCH=2.2.4 USE_COMPOSER=1
+      env: BRANCH=2.2.4
 
     - php: 7.0
       env: BRANCH=2.2.5
     - php: 7.1
       env: BRANCH=2.2.5
     - php: 7.2
-      env: BRANCH=2.2.5 USE_COMPOSER=1
+      env: BRANCH=2.2.5
 
     - php: 7.0
       env: BRANCH=2.2.6
     - php: 7.1
       env: BRANCH=2.2.6
     - php: 7.2
-      env: BRANCH=2.2.6 USE_COMPOSER=1
+      env: BRANCH=2.2.6
 
     - php: 7.0
       env: BRANCH=2.2.7
     - php: 7.1
       env: BRANCH=2.2.7
     - php: 7.2
-      env: BRANCH=2.2.7 USE_COMPOSER=1
+      env: BRANCH=2.2.7
 
     - php: 7.0
       env: BRANCH=2.2.8
     - php: 7.1
       env: BRANCH=2.2.8
     - php: 7.2
-      env: BRANCH=2.2.8 USE_COMPOSER=1
+      env: BRANCH=2.2.8
 
     - php: 7.0
       env: BRANCH=2.2.9
     - php: 7.1
       env: BRANCH=2.2.9
     - php: 7.2
-      env: BRANCH=2.2.9 USE_COMPOSER=1
+      env: BRANCH=2.2.9
 
     - php: 7.0
       env: BRANCH=2.2.10
     - php: 7.1
       env: BRANCH=2.2.10
     - php: 7.2
-      env: BRANCH=2.2.10 USE_COMPOSER=1
+      env: BRANCH=2.2.10
 
     - php: 7.1
       env: BRANCH=2.3.0
     - php: 7.2
-      env: BRANCH=2.3.0 USE_COMPOSER=1
+      env: BRANCH=2.3.0
     - php: 7.3
-      env: BRANCH=2.3.0 USE_COMPOSER=1
+      env: BRANCH=2.3.0
 
     - php: 7.1
       env: BRANCH=2.3.1
     - php: 7.2
-      env: BRANCH=2.3.1 USE_COMPOSER=1
+      env: BRANCH=2.3.1
     - php: 7.3
-      env: BRANCH=2.3.1 USE_COMPOSER=1
+      env: BRANCH=2.3.1
 
     - php: 7.1
       env: BRANCH=2.3.2
     - php: 7.2
-      env: BRANCH=2.3.2 USE_COMPOSER=1
+      env: BRANCH=2.3.2
     - php: 7.3
-      env: BRANCH=2.3.2 USE_COMPOSER=1
+      env: BRANCH=2.3.2
 
     - php: 7.1
       env: BRANCH=2.3.3
     - php: 7.2
-      env: BRANCH=2.3.3 USE_COMPOSER=1
+      env: BRANCH=2.3.3
     - php: 7.3
-      env: BRANCH=2.3.3 USE_COMPOSER=1
+      env: BRANCH=2.3.3
 
     - php: 7.1
       env: BRANCH=2.3.4
     - php: 7.2
-      env: BRANCH=2.3.4 USE_COMPOSER=1
+      env: BRANCH=2.3.4
     - php: 7.3
-      env: BRANCH=2.3.4 USE_COMPOSER=1
+      env: BRANCH=2.3.4
 
 before_script:
   - bash bin/install.sh
diff --git a/Makefile b/Makefile
index e77f637..cc64d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,5 @@ delete_archive:
 	rm -f $(ARCHIVE_NAME)
 
 ci:
-ifeq ($(USE_COMPOSER),1)
 	php $(MAGE_ROOT)/vendor/phpunit/phpunit/phpunit -c $(MAGE_ROOT)/dev/tests/unit/phpunit.xml.dist $(MAGE_ROOT)/app/code/Retailcrm/Retailcrm/Test/Unit
-else
-	phpunit -c $(MAGE_ROOT)/dev/tests/unit/phpunit.xml.dist $(MAGE_ROOT)/app/code/Retailcrm/Retailcrm/Test/Unit
-endif
+