diff --git a/appveyor.yml b/appveyor-py27.yml
similarity index 73%
rename from appveyor.yml
rename to appveyor-py27.yml
index dfd178a..f5f65af 100644
--- a/appveyor.yml
+++ b/appveyor-py27.yml
@@ -1,31 +1,14 @@
 environment:
 
   matrix:
-
-    # For Python versions available on Appveyor, see
-    # http://www.appveyor.com/docs/installed-software#python
-    # The list here is complete (excluding Python 2.6, which
-    # isn't covered by this document) at the time of writing.
-
     - PYTHON: "C:\\Python27-x64"
       PYTHON_EXE: "C:\\Python27-x64\\python.exe"
       TOXENV: 'test-py27'
       MPLBACKEND: 'Agg'
       PATH: "C:\\Python27-x64;$(PATH)"
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_EXE: "C:\\Python35-x64\\python.exe"
-      TOXENV: 'test-py35'
-      MPLBACKEND: 'Agg'
-      PATH: "C:\\Python35-x64;$(PATH)"
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_EXE: "C:\\Python36-x64\\python.exe"
-      TOXENV: 'test-py36'
-      MPLBACKEND: 'Agg'
-      PATH: "C:\\Python36-x64;$(PATH)"
 
 install:
   # We need wheel installed to build wheels
-  - ps: "Get-ChildItem Env:"
   - cmd: "%PYTHON%\\python.exe -m pip install wheel tox numpy cython"
 
 build: off
diff --git a/appveyor-py35.yaml b/appveyor-py35.yaml
new file mode 100644
index 0000000..358af4a
--- /dev/null
+++ b/appveyor-py35.yaml
@@ -0,0 +1,45 @@
+environment:
+
+  matrix:
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_EXE: "C:\\Python35-x64\\python.exe"
+      TOXENV: 'test-py35'
+      MPLBACKEND: 'Agg'
+      PATH: "C:\\Python35-x64;$(PATH)"
+
+install:
+  # We need wheel installed to build wheels
+  - cmd: "%PYTHON%\\python.exe -m pip install wheel tox numpy cython"
+
+build: off
+
+before_test:
+  - cmd: "%PYTHON%\\python.exe setup.py build_ext"
+
+test_script:
+  # Put your test command here.
+  # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4,
+  # you can remove "build.cmd" from the front of the command, as it's
+  # only needed to support those cases.
+  # Note that you must use the environment variable %PYTHON% to refer to
+  # the interpreter you're using - Appveyor does not do anything special
+  # to put the Python version you want to use on PATH.
+  - cmd: echo %PATH%
+  - cmd: SET PATH=%PYTHON%;%PATH%
+  - cmd: "%PYTHON%\\Scripts\\tox --skip-missing-interpreters"
+
+after_test:
+  # This step builds your wheels.
+  # Again, you only need 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
+  - cmd: IF %APPVEYOR_REPO_TAG% == 'True' (%PYTHON%\\python.exe setup.py bdist_wheel) ELSE (echo Not building because this is not a tag build)
+  - ps: if ($env:APPVEYOR_REPO_TAG -eq 'True') {ls dist}
+artifacts:
+  # bdist_wheel puts your built wheel in the dist directory
+  - path: dist\*
+
+#on_success:
+#  You can use this step to upload your artifacts to a public website.
+#  See Appveyor's documentation for more details. Or you can simply
+#  access your wheels from the Appveyor "artifacts" tab for your build.
\ No newline at end of file
diff --git a/appveyor-py36.yml b/appveyor-py36.yml
new file mode 100644
index 0000000..78c99dd
--- /dev/null
+++ b/appveyor-py36.yml
@@ -0,0 +1,45 @@
+environment:
+
+  matrix:
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_EXE: "C:\\Python36-x64\\python.exe"
+      TOXENV: 'test-py36'
+      MPLBACKEND: 'Agg'
+      PATH: "C:\\Python36-x64;$(PATH)"
+
+install:
+  # We need wheel installed to build wheels
+  - cmd: "%PYTHON%\\python.exe -m pip install wheel tox numpy cython"
+
+build: off
+
+before_test:
+  - cmd: "%PYTHON%\\python.exe setup.py build_ext"
+
+test_script:
+  # Put your test command here.
+  # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4,
+  # you can remove "build.cmd" from the front of the command, as it's
+  # only needed to support those cases.
+  # Note that you must use the environment variable %PYTHON% to refer to
+  # the interpreter you're using - Appveyor does not do anything special
+  # to put the Python version you want to use on PATH.
+  - cmd: echo %PATH%
+  - cmd: SET PATH=%PYTHON%;%PATH%
+  - cmd: "%PYTHON%\\Scripts\\tox --skip-missing-interpreters"
+
+after_test:
+  # This step builds your wheels.
+  # Again, you only need 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
+  - cmd: IF %APPVEYOR_REPO_TAG% == 'True' (%PYTHON%\\python.exe setup.py bdist_wheel) ELSE (echo Not building because this is not a tag build)
+  - ps: if ($env:APPVEYOR_REPO_TAG -eq 'True') {ls dist}
+artifacts:
+  # bdist_wheel puts your built wheel in the dist directory
+  - path: dist\*
+
+#on_success:
+#  You can use this step to upload your artifacts to a public website.
+#  See Appveyor's documentation for more details. Or you can simply
+#  access your wheels from the Appveyor "artifacts" tab for your build.
\ No newline at end of file