diff --git a/.travis.yml b/.travis.yml
index 79892ca..234c24f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,10 @@ matrix:
     python: 3.5
   - env: TOXENV=py34-dj18-wt16
     python: 3.4
+  - env: TOXENV=py33-dj18-wt16
+    python: 3.3
   - env: TOXENV=py27-dj18-wt16
     python: 2.7
-  - env: TOXENV=py35-dj110-wt15
-    python: 3.5
-  - env: TOXENV=py34-dj110-wt15
-    python: 3.4
-  - env: TOXENV=py27-dj110-wt15
-    python: 2.7
   - env: TOXENV=py35-dj19-wt15
     python: 3.5
   - env: TOXENV=py34-dj19-wt15
@@ -37,6 +33,8 @@ matrix:
     python: 3.5
   - env: TOXENV=py34-dj18-wt15
     python: 3.4
+  - env: TOXENV=py33-dj18-wt15
+    python: 3.3
   - env: TOXENV=py27-dj18-wt15
     python: 2.7
 
diff --git a/Makefile b/Makefile
index 73de60e..00c44f4 100644
--- a/Makefile
+++ b/Makefile
@@ -79,9 +79,8 @@ docs: ## generate Sphinx HTML documentation, including API docs
 servedocs: docs ## compile the docs watching for changes
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
-release: clean ## package and upload a release
-	python setup.py sdist upload
-	python setup.py bdist_wheel upload
+release: dist ## package and upload a release
+	twine upload dist/*
 
 dist: clean ## builds source and wheel package
 	python setup.py sdist
diff --git a/setup.py b/setup.py
index e611a75..75ff4f6 100644
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,6 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
diff --git a/tox.ini b/tox.ini
index cd999bd..ed64d70 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ skipsdist = True
 usedevelop = True
 
 envlist =
-    py{27,34,35}-dj{18,19,110}-wt{15,16}
+    py{27,33,34,35}-dj{18,19,110}-wt{15,16}
     flake8
 
 
@@ -14,6 +14,7 @@ commands = python runtests.py {posargs}
 
 basepython =
     py27: python2.7
+    py33: python3.3
     py34: python3.4
     py35: python3.5