diff --git a/.travis.yml b/.travis.yml
index 10b4b60..62511c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
+    - "3.7"
     - "nightly"
 
 dist: trusty
@@ -16,6 +17,8 @@ addons:
     - build-essential
 
 install:
+    - git submodule init
+    - git submodule update
     - pip install -r requirements.txt
     - pip install .
 
diff --git a/setup.py b/setup.py
index b2f572a..fbb6348 100644
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,7 @@ from setuptools.command.build_py import build_py
 class CustomBuildPy(build_py):
 
     def run(self):
-        subprocess.call("git submodule init && git submodule update && \
-                         cd assimp/ && mkdir -p build && cd build && \
+        subprocess.call("cd assimp/ && mkdir -p build && cd build && \
                          cmake .. -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF && \
                          make", shell=True)
         build_py.run(self)
diff --git a/tox.ini b/tox.ini
index f82c64d..ad6e883 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36
+envlist = py27,py36,py37
 
 [testenv]
 deps = -rrequirements.txt