diff --git a/.travis.yml b/.travis.yml
index b50cc7a..51289de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,29 @@
 language: python
-python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-install: "pip install -r requirements-test.txt"
-script: "py.test ./tests"
+python: "3.6"
+
+matrix:
+  include:
+    - sudo: required
+      services:
+        - docker
+#    - os: osx
+#      language: generic
+#      env:
+#        - PY_VERSION=3
+
+env:
+  global:
+    - CIBW_TEST_REQUIRES="pytest pytest-benchmark pytz"
+    - CIBW_TEST_COMMAND="py.test {project}/tests"
+    - CIBW_SKIP="cp2* cp33*"
+    - TWINE_USERNAME=lelit
+      # Note: TWINE_PASSWORD is set in Travis settings
+
+script:
+  - pip install cibuildwheel==0.4.0
+  - cibuildwheel --output-dir wheelhouse
+  - |
+    if [[ $TRAVIS_TAG ]]; then
+      pip install twine
+      twine upload wheelhouse/*.whl
+    fi
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..0207ef1
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,24 @@
+environment:
+  global:
+    CIBW_TEST_REQUIRES: "pytest pytest-benchmark pytz"
+    CIBW_TEST_COMMAND: "py.test {project}/tests"
+    CIBW_SKIP: "cp2* cp33*"
+    TWINE_USERNAME: lelit
+    # Note: TWINE_PASSWORD is set in Appveyor settings
+  matrix:
+    - PYTHON: "C:\\Python35-x64\\python.exe"
+
+install: "git submodule update --init --recursive"
+
+build_script:
+  - "%PYTHON% -m pip install cibuildwheel==0.4.0"
+  - "%PYTHON% -m cibuildwheel --output-dir wheelhouse"
+  - ps: >-
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+        %PYTHON% -m pip install twine
+        %PYTHON% -m twine upload (resolve-path wheelhouse\*.whl)
+      }
+
+artifacts:
+  - path: "wheelhouse\\*.whl"
+    name: Wheels