diff --git a/.travis.yml b/.travis.yml
index cda3047..198d114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ matrix:
         - docker
       env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
            PRE_CMD=linux32
-    - os: osx
-      env: PYTHON=python2
+    # - os: osx
+    #   env: PYTHON=python2
     - os: osx
       env: PYTHON=python3
 
diff --git a/appveyor.yml b/appveyor.yml
index f4131b5..23392ed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,14 +4,18 @@
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
-    - PYTHON: "C:\\Python34"
+    # - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37"
+    - PYTHON: "C:\\Python38"
     #- PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python34-x64"
-      DISTUTILS_USE_SDK: "1"
+    # - PYTHON: "C:\\Python34-x64"
+      # DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python37-x64"
+    - PYTHON: "C:\\Python38-x64"
 
 install:
   # initialize the submodule
diff --git a/ecos b/ecos
index 40e26ef..3b98fe0 160000
--- a/ecos
+++ b/ecos
@@ -1 +1 @@
-Subproject commit 40e26efa371dd85b95bacc4ee825da80fa11a200
+Subproject commit 3b98fe0376ceeeb8310a06694b0a84ac59920f3f
diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh
index 8a2c987..8b3e8cc 100755
--- a/travis/build-osx-wheels.sh
+++ b/travis/build-osx-wheels.sh
@@ -2,8 +2,8 @@
 set -e -x
 
 # Compile wheels
-$PYTHON -m pip install nose coverage
+$PYTHON -m pip install --user nose coverage
 $PYTHON -m pip wheel . -w wheelhouse/
 
-$PYTHON -m pip install ecos --no-index -f wheelhouse
+$PYTHON -m pip install --user ecos>=2.0.7 --no-index --find-links=wheelhouse
 $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py
diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh
index 63887e6..018a797 100755
--- a/travis/build-wheels.sh
+++ b/travis/build-wheels.sh
@@ -6,8 +6,11 @@ set -e -x
 
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
-    "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt
-    "${PYBIN}/pip" wheel /io/ -w wheelhouse/
+    # Skip Python 3.9 because no numpy and scipy wheels yet
+    if ! echo "$PYBIN" | grep -q "cp39"; then
+      "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt
+      "${PYBIN}/pip" wheel /io/ -w wheelhouse/
+    fi
 done
 
 # Bundle external shared libraries into the wheels
@@ -27,6 +30,6 @@ done
 
 # Install packages and test
 for PYBIN in /opt/python/*/bin/; do
-    "${PYBIN}/pip" install ecos --no-index -f /io/wheelhouse
+    "${PYBIN}/pip" install ecos --no-index --find-links=/io/wheelhouse
     (cd "$HOME"; "${PYBIN}/nosetests" --with-cover --cover-package=ecos /io/src/test_interface.py /io/src/test_interface_bb.py)
 done