diff --git a/bin/check-dist b/bin/check-dist
index 1393ba77..a520c3db 100755
--- a/bin/check-dist
+++ b/bin/check-dist
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")
diff --git a/bin/dist-functions b/bin/dist-functions
index b8a978ea..f4d6780c 100644
--- a/bin/dist-functions
+++ b/bin/dist-functions
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 DIST="${ROOT}/dist"
@@ -52,6 +53,18 @@ function set_metadata_and_setup
     grep "version\s\+=" neo4j/meta.py
     echo "----------------------------------------"
 
+    function cleanup() {
+      # Reset to original package metadata
+      set_package "${ORIGINAL_PACKAGE}"
+      set_version "${ORIGINAL_VERSION}"
+      echo "Source code reconfigured back to original package ${ORIGINAL_PACKAGE}/${ORIGINAL_VERSION}"
+      echo "----------------------------------------"
+      grep "package\s\+=" neo4j/meta.py
+      grep "version\s\+=" neo4j/meta.py
+      echo "----------------------------------------"
+    }
+    trap cleanup EXIT
+
     # Temporarily override package metadata
     set_package "${PACKAGE}"
     set_version "${VERSION}"
@@ -67,15 +80,8 @@ function set_metadata_and_setup
     python setup.py $*
     check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"
 
-    # Reset to original package metadata
-    set_package "${ORIGINAL_PACKAGE}"
-    set_version "${ORIGINAL_VERSION}"
-    echo "Source code reconfigured back to original package ${ORIGINAL_PACKAGE}/${ORIGINAL_VERSION}"
-    echo "----------------------------------------"
-    grep "package\s\+=" neo4j/meta.py
-    grep "version\s\+=" neo4j/meta.py
-    echo "----------------------------------------"
-
+  trap - EXIT
+  cleanup
 }
 
 function setup
diff --git a/bin/make-dist b/bin/make-dist
index 074cd137..49e3ecc8 100755
--- a/bin/make-dist
+++ b/bin/make-dist
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")
diff --git a/bin/make-docs b/bin/make-docs
index bdd68394..ffa8cf5a 100755
--- a/bin/make-docs
+++ b/bin/make-docs
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 
diff --git a/bin/make-pypirc b/bin/make-pypirc
deleted file mode 100755
index 74aad382..00000000
--- a/bin/make-pypirc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT=$(basename "$0")
-
-PYPIRC="${HOME}/.pypirc"
-PYPI_USERNAME="$1"
-PYPI_PASSWORD="$2"
-
-if [ -f "${PYPIRC}" ]
-then
-    echo "${PYPIRC}" already exists - not overwriting
-    exit 1
-fi
-
-if [ "${PYPI_USERNAME}" == "" ]
-then
-    echo "usage: ${SCRIPT} USERNAME PASSWORD"
-    exit 1
-fi
-
-if [ "${PYPI_PASSWORD}" == "" ]
-then
-    echo "usage: ${SCRIPT} USERNAME PASSWORD"
-    exit 1
-fi
-
-touch ${PYPIRC}
-echo "[distutils]" >> ${PYPIRC}
-echo "index-servers =" >> ${PYPIRC}
-echo "    pypi" >> ${PYPIRC}
-echo "" >> ${PYPIRC}
-echo "[pypi]" >> ${PYPIRC}
-echo "repository: https://upload.pypi.org/legacy/" >> ${PYPIRC}
-echo "username: ${PYPI_USERNAME}" >> ${PYPIRC}
-echo "password: ${PYPI_PASSWORD}" >> ${PYPIRC}
diff --git a/bin/release b/bin/release
index dc2b37b6..2f2844d7 100755
--- a/bin/release
+++ b/bin/release
@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")
+TWINE_ARGS="--verbose"
+
+if [ "$1" == "--real" ]
+then
+    shift
+else
+    TWINE_ARGS="${TWINE_ARGS} --repository testpypi"
+fi
 
 VERSION="$1"
 if [ "${VERSION}" == "" ]
@@ -10,5 +19,7 @@ then
     exit 1
 else
     source "${ROOT}/bin/dist-functions"
-    setup "${VERSION}" sdist upload -r pypi --show-response
+    twine upload ${TWINE_ARGS} \
+        "${DIST}/neo4j-driver-${VERSION}.tar.gz" \
+        "${DIST}/neo4j-${VERSION}.tar.gz"
 fi