diff --git a/.travis.yml b/.travis.yml
index c0ecf47e4..33de22eec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
-#  - "3.6" Not supported by pyinstaller yet
+  - "3.6"
 # Travis doesn't support testing python on Mac yet, so we need
 # to workaround it by installing it directly with brew.
 #
@@ -42,6 +42,10 @@ matrix:
     - PYTHON_VER=3.5.0
     - PYENV_ROOT="$HOME/.pyenv"
     - PATH="$PYENV_ROOT/bin:$PATH"
+  # 3.7 needs Xenial image because of https://github.com/travis-ci/travis-ci/issues/9069
+  - python: "3.7"
+    dist: xenial
+    sudo: true
 before_install:
   - bash ./scripts/ci/before_install.sh
   - if  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
diff --git a/dvc/remote/base.py b/dvc/remote/base.py
index a9e7911b0..f5ef4415b 100644
--- a/dvc/remote/base.py
+++ b/dvc/remote/base.py
@@ -1,5 +1,6 @@
 import os
 import re
+import errno
 
 from dvc.config import Config
 from dvc.logger import Logger
@@ -84,10 +85,11 @@ class RemoteBase(object):
 
     def _makedirs(self, fname):
         dname = os.path.dirname(fname)
+
         try:
             os.makedirs(dname)
         except OSError as e:
-            if e.errno != os.errno.EEXIST:
+            if e.errno != errno.EEXIST:
                 raise
 
     def md5s_to_path_infos(self, md5s):