diff --git a/.travis.yml b/.travis.yml
index ea17341..6a3cb33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,24 @@ matrix:
       language: python
       python: 2.7
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=FULL
+        - TO_TEST=TEST_FULL
     - os: linux
       language: python
       python: 3.4
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=FULL
+        - TO_TEST=TEST_FULL
     - os: linux
       language: python
       python: 3.7
-      # dist: xenial
-      # sudo: true
+      dist: xenial
+      sudo: true
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=FULL
+        - TO_TEST=TEST_FULL
     - os: osx
       language: generic
       python: 2.7
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=FULL
+        - TO_TEST=TEST_FULL
       # before_install:
       #   - python2 --version
       #   - pip2 install -U virtualenv
@@ -38,10 +34,8 @@ matrix:
       language: generic
       python: ">=3.6"
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=FULL
+        - TO_TEST=TEST_FULL
       before_install:
-        - brew update
         - brew outdated python3 || brew install python3 || brew upgrade python3
         - python3 -m venv env
         - source env/bin/activate
@@ -51,20 +45,17 @@ matrix:
       language: python
       python: 3.3
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=MOCK
+        - TO_TEST=TEST_MOCK
     - os: linux
       language: python
       python: 3.5
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=MOCK
+        - TO_TEST=TEST_MOCK
     - os: linux
       language: python
       python: 3.6
       env:
-        - TO_TEST=TEST
-        - TEST_MODE=MOCK
+        - TO_TEST=TEST_MOCK
 
     # Install tests
     - os: linux
@@ -91,11 +82,10 @@ matrix:
   allow_failures:
     - python: 3.3
 
-# command to install dependencies
-install:
-    - python --version
-    - export PUBS_TESTS_MODE=ONLINE
-
 # command to run tests
 script:
-  - ./test_script.sh
+  - python --version
+  - if [ "$TEST_MODE" = "TEST_FULL" ]; then PUBS_TESTS_MODE=MOCK    python setup.py test; fi
+  - if [ "$TEST_MODE" = "TEST_FULL" ]; then PUBS_TESTS_MODE=COLLECT python setup.py test; fi
+  - if [ "$TEST_MODE" = "TEST_MOCK" ]; then PUBS_TESTS_MODE=MOCK    python setup.py test; fi
+  - if [ "$TEST_MODE" = "INSTALL" ]; then pip install -U pip; pip install pubs; pubs --help; pip uninstall -y pubs; fi
diff --git a/test_script.sh b/test_script.sh
deleted file mode 100755
index d1e9dc1..0000000
--- a/test_script.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ "$TEST_MODE" = "TEST" ]; then
-  PUBS_TESTS_MODE=MOCK python setup.py test;
-  if [ "$TO_TEST" = "FULL" ]; then PUBS_TESTS_MODE=COLLECT python setup.py test; fi;
-fi
-
-if [ "$TEST_MODE" = "INSTALL" ]; then
-  pip install pubs;
-  pubs --help;
-  pip uninstall -y pubs;
-fi