diff --git a/.travis.yml b/.travis.yml
index 3c1c0ccd..31e8fe1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,24 @@ env:
   global:
   - COMPILER=g++
 
+# Default --recursive (rapidjson/thirdparty/gtest) is unnecessary
+git:
+  submodules: false
+  depth: 3
+
+before_install:
+  - git submodule update --init
+
 addons:
   apt:
     sources: &apt_sources
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise-3.5
-      - llvm-toolchain-precise-3.6
-      - llvm-toolchain-precise-3.7
-      - llvm-toolchain-precise-3.8
-      - llvm-toolchain-trusty-3.9
-      - llvm-toolchain-trusty-4.0
+      #- llvm-toolchain-precise-3.6
+      #- llvm-toolchain-precise-3.7
+      #- llvm-toolchain-precise-3.8
+      #- llvm-toolchain-trusty-3.9
+      #- llvm-toolchain-trusty-4.0
       - llvm-toolchain-trusty-5.0
 
 compiler: clang
diff --git a/wscript b/wscript
index 5ef6bf7e..93d8e3c5 100644
--- a/wscript
+++ b/wscript
@@ -93,7 +93,7 @@ def download_and_extract(destdir, url, ext):
   dest = destdir + ext
 
   # Extract the tarball.
-  if not os.path.isdir(destdir):
+  if not os.path.isdir(os.path.join(destdir, 'include')):
     # Download and save the compressed tarball as |compressed_file_name|.
     if not os.path.isfile(dest):
       print('Downloading tarball')