diff --git a/Makefile b/Makefile
index 37a377306d..c35edc14fc 100644
--- a/Makefile
+++ b/Makefile
@@ -87,8 +87,13 @@ requirements_testing:
 
 # Releases
 
+
+test_release: clean wheel
+	twine upload dist/* -r testpypi
+	@echo "Test with: pip install -i https://testpypi.python.org/pypi mayan-edms"
+
 release: clean wheel
-	python setup.py upload
+	twine upload dist/* -r pypi
 
 sdist: clean
 	python setup.py sdist
@@ -106,5 +111,3 @@ runserver:
 
 shell_plus:
 	./manage.py shell_plus --settings=mayan.settings.development
-
-
diff --git a/requirements/development.txt b/requirements/development.txt
index 8fd957cd99..2169026ca8 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -11,6 +11,7 @@ ipython==4.0.3
 pypandoc==1.3.3
 
 transifex-client==0.12.2
+twine==1.8.1
 
 wheel==0.26.0