diff --git a/Makefile b/Makefile
index fc8b0b7..b1bfc54 100644
--- a/Makefile
+++ b/Makefile
@@ -74,9 +74,13 @@ 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 .
 
+test-release: clean ## package and upload a release to the testpypi
+	$(MAKE) dist
+	twine upload --repository testpypi dist/*
+
 release: clean ## package and upload a release
-	python setup.py sdist upload
-	python setup.py bdist_wheel upload
+	$(MAKE) dist
+	twine upload dist/*
 
 dist: clean ## builds source and wheel package
 	python setup.py sdist
diff --git a/requirements_dev.txt b/requirements_dev.txt
index f833598..bdb3c0c 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -16,3 +16,4 @@ coverage>=3.7.1
 mock==2.0.0
 six==1.11.0
 python-box==3.1.1
+twine==1.9.1