diff --git a/.travis.yml b/.travis.yml
index 4258356d..f5b5f1cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,17 +18,17 @@ env:
 
 matrix:
   include:
-    - python: 3.6
+    - python: 3.7
       env:
-        - TOXENV=cov
-        - JEDI_TEST_ENVIRONMENT=36
+        - TOXENV=cov-py37
+        - JEDI_TEST_ENVIRONMENT=37
     # For now ignore pypy, there are so many issues that we don't really need
     # to run it.
     #- python: pypy
     # The 3.9 dev build does not seem to be available end 2019.
     #- python: 3.9-dev
     #  env:
-    #    - JEDI_TEST_ENVIRONMENT=38
+    #    - JEDI_TEST_ENVIRONMENT=39
 install:
     - pip install --quiet tox-travis
 script:
@@ -62,7 +62,7 @@ script:
     - tox
 after_script:
     - |
-      if [ $TOXENV == "cov" ]; then
+      if [ $TOXENV == "cov-py37" ]; then
         pip install --quiet codecov coveralls
         coverage xml
         coverage report -m
diff --git a/test/run.py b/test/run.py
index a91dc679..26a5421d 100755
--- a/test/run.py
+++ b/test/run.py
@@ -206,7 +206,8 @@ class IntegrationTestCase(BaseTestCase):
             TEST_GOTO: self.run_goto,
             TEST_REFERENCES: self.run_find_references,
         }
-        if self.path.endswith('pytest.py') and environment.executable != sys.executable:
+        if self.path.endswith('pytest.py') \
+                and environment.executable != os.path.realpath(sys.executable):
             # It's not guarantueed that pytest is installed in test
             # environments, if we're not running in the same environment that
             # we're already in, so just skip that case.