diff --git a/MANIFEST.in b/MANIFEST.in
index 0e0e58b..633da69 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,6 @@
 recursive-include tests *.py *.json
+recursive-include httplib2 *.py *.json
+recursive-include uritemplate *.py *.json
 recursive-include apiclient *.json *.py
 recursive-include docs *.html
 recursive-include samples *.py *.png *.html *.yaml *.json
diff --git a/Makefile b/Makefile
index 4ae3f1d..1fc70e6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@
 
 .PHONY: prerelease
 prerelease:
-	python2.4 runtests.py --exit_on_failure
-	python2.6 runtests.py --exit_on_failure
-	python2.7 runtests.py --exit_on_failure
+	python2.4 runtests.py tests --exit_on_failure
+	python2.6 runtests.py tests --exit_on_failure
+	python2.7 runtests.py tests --exit_on_failure
 	-rm dist/*
 	python setup.py clean
 	python setup.py sdist
diff --git a/setup.py b/setup.py
index 2cb03ef..ba7e619 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,8 @@
 
 import setup_utils
 
+# Modules, not packages, that might need to be installed.
+
 packages = [
   'apiclient',
   'oauth2client',
@@ -30,12 +32,15 @@
   'apiclient.contrib.moderator',
   'uritemplate',
 ]
+py_modules = []
 
-third_party_reqs = ['httplib2', 'gflags', 'gflags_validators']
+third_party_packages = ['httplib2']
+third_party_modules = ['gflags', 'gflags_validators']
 
 # Don't clobber installed versions of third party libraries
 # with what we include.
-packages.extend(setup_utils.get_missing_requirements(third_party_reqs))
+packages.extend(setup_utils.get_missing_requirements(third_party_packages))
+py_modules.extend(setup_utils.get_missing_requirements(third_party_modules))
 
 try:
   # Some people prefer setuptools, and may have that installed
@@ -54,6 +59,7 @@
       author_email="jcgregorio@google.com",
       url="http://code.google.com/p/google-api-python-client/",
       packages=packages,
+      py_modules=py_modules,
       package_data={
         'apiclient': ['contrib/*/*.json']
         },