diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..de240d7
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,13 @@
+machine:
+  post:
+    - pyenv install pypy-5.3
+    - pyenv global 2.7.10 3.4.3 3.5.0 pypy-5.3
+
+deployment:
+  pypi:
+    owner: ouspg
+    tag: /^v[0-9.]+$/
+    commands:
+      - pip install twine
+      - python setup.py bdist_wheel --universal
+      - twine upload --username "${PYPI_USERNAME}" --password "${PYPI_PASSWORD}" dist/*.whl
diff --git a/setup.py b/setup.py
index 30ce698..b518528 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,8 @@ def format_version(version_info):
 setup(
     name="trytls",
     version=trytls.__version__,
+    license="MIT",
+    url="https://github.com/ouspg/trytls",
     package_dir={"": "./runners"},
     packages=find_packages("./runners"),
     entry_points={
diff --git a/tox.ini b/tox.ini
index 3a3e387..6db0f9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py34,py35,pypy
+skip_missing_interpreters = true
 
 [testenv]
 deps =