diff --git a/Makefile b/Makefile
index 9206715..8d6962b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,8 @@
 APP_ENGINE_PATH=../google_appengine
 
 test:
-	python runtests.py tests/test_discovery.py
-	python runtests.py tests/test_errors.py
-	python runtests.py tests/test_http.py
-	python runtests.py tests/test_json_model.py
-	python runtests.py tests/test_mocks.py
-	python runtests.py tests/test_model.py
-	python runtests.py tests/test_oauth2client_clientsecrets.py
-	python runtests.py tests/test_oauth2client_django_orm.py
-	python runtests.py tests/test_oauth2client_file.py
-	python runtests.py tests/test_oauth2client_jwt.py
-	python runtests.py tests/test_oauth2client.py
-	python runtests.py tests/test_oauth.py
-	python runtests.py tests/test_protobuf_model.py
-	python runtests.py tests/test_schema.py
-	python runtests.py tests/test_oauth2client_appengine.py
+	./runtests.sh python2.6
+	./runtests.sh python2.7
 
 
 .PHONY: coverage
@@ -35,8 +22,8 @@
 
 .PHONY: prerelease
 prerelease:
-	python2.6 runtests.py tests --exit_on_failure
-	python2.7 runtests.py tests --exit_on_failure
+	./runtests.sh python2.6
+	./runtests.sh python2.7
 	-sudo rm -rf dist/
 	-sudo rm -rf snapshot/
 	python expand-symlinks.py
diff --git a/apiclient/__init__.py b/apiclient/__init__.py
index e69de29..22b9bc9 100644
--- a/apiclient/__init__.py
+++ b/apiclient/__init__.py
@@ -0,0 +1 @@
+__version__ = "1.0beta8"
diff --git a/oauth2client/__init__.py b/oauth2client/__init__.py
index e69de29..22b9bc9 100644
--- a/oauth2client/__init__.py
+++ b/oauth2client/__init__.py
@@ -0,0 +1 @@
+__version__ = "1.0beta8"
diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 0000000..dabf112
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,21 @@
+#/bin/bash
+#
+# Run all the tests.
+#
+# The python interpreter to use is passed in on the command line.
+
+$1 runtests.py tests/test_discovery.py
+$1 runtests.py tests/test_errors.py
+$1 runtests.py tests/test_http.py
+$1 runtests.py tests/test_json_model.py
+$1 runtests.py tests/test_mocks.py
+$1 runtests.py tests/test_model.py
+$1 runtests.py tests/test_oauth2client_clientsecrets.py
+$1 runtests.py tests/test_oauth2client_django_orm.py
+$1 runtests.py tests/test_oauth2client_file.py
+$1 runtests.py tests/test_oauth2client_jwt.py
+$1 runtests.py tests/test_oauth2client.py
+$1 runtests.py tests/test_oauth.py
+$1 runtests.py tests/test_protobuf_model.py
+$1 runtests.py tests/test_schema.py
+$1 runtests.py tests/test_oauth2client_appengine.py
diff --git a/setup.py b/setup.py
index 2a71fdf..008dfdf 100644
--- a/setup.py
+++ b/setup.py
@@ -47,8 +47,11 @@
 long_desc = """The Google API Client for Python is a client library for
 accessing the Plus, Moderator, and many other Google APIs."""
 
+import apiclient
+version = apiclient.__version__
+
 setup(name="google-api-python-client",
-      version="1.0beta8",
+      version=version,
       description="Google API Client Library for Python",
       long_description=long_desc,
       author="Joe Gregorio",
diff --git a/setup_oauth2client.py b/setup_oauth2client.py
index 4c727cd..579fe5f 100644
--- a/setup_oauth2client.py
+++ b/setup_oauth2client.py
@@ -39,8 +39,11 @@
 
 long_desc = """The oauth2client is a client library for OAuth 2.0."""
 
+import oauth2client
+version = oauth2client.__version__
+
 setup(name="oauth2client",
-      version="1.0beta8",
+      version=version,
       description="OAuth 2.0 client library",
       long_description=long_desc,
       author="Joe Gregorio",