diff --git a/.appveyor.yml b/.appveyor.yml
index 0c3448305..141a3ae71 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,7 +6,7 @@ environment:
 
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
-    #- PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27"
     - PYTHON: "C:\\Python27-x64"
     #  DISTUTILS_USE_SDK: "1"
     #  TOX_TESTENV_PASSENV: "DISTUTILS_USE_SDK INCLUDE LIB"
@@ -34,16 +34,19 @@ test_script:
     %PYTHON%\Scripts\tox.exe -e py
 
 after_test:
-  # This step builds your wheels.
+  # This builds the main tahoe wheel, and wheels for all dependencies.
   # Again, you only need build.cmd if you're building C extensions for
   # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct
   # interpreter
   - |
     %PYTHON%\python.exe setup.py bdist_wheel
+    %PYTHON%\python.exe -m pip wheel -w dist .
 
 artifacts:
   # bdist_wheel puts your built wheel in the dist directory
-  - path: dist\*
+  # "pip wheel -w dist ." puts all the dependency wheels there too
+  # this gives us a zipfile with everything
+  - path: dist
 
 #on_success:
 #  You can use this step to upload your artifacts to a public website.
diff --git a/.travis.yml b/.travis.yml
index 127fd5854..cd594289b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,6 @@ sudo: true
 os:
  - "linux"
  - "osx"
-# xcode7 gives us OS-X 10.10, which gives us newer OpenSSL (the default gives
-# us 10.9, which appears to have OpenSSL-0.9.8, which is rejected by
-# cryptography-1.4)
-osx_image: xcode7
 cache: pip
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log