diff --git a/build.sh b/build.sh
index 82d8c05e..2f0595e9 100755
--- a/build.sh
+++ b/build.sh
@@ -150,6 +150,7 @@ for outfile in \
   python-interpreter-builder/Dockerfile \
   runtime-image/Dockerfile \
   tests/benchmark/Dockerfile \
+  tests/eventlet/Dockerfile \
   tests/google-cloud-python/Dockerfile \
   tests/google-cloud-python-system/Dockerfile \
   tests/integration/Dockerfile \
@@ -167,6 +168,9 @@ for file in \
   cp -a "${file}" "builder/gen-dockerfile/${file##scripts/}"
 done
 
+# Make a file available to the eventlet test.
+cp -a scripts/testdata/hello_world/main.py tests/eventlet/main.py
+
 # Build images and push to GCR
 if [ "${build}" -eq 1 ]; then
   echo "Building images"
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 187884dc..68b5c5bb 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -25,6 +25,10 @@ steps:
     '--config', '/workspace/tests/license-test/license-test.yaml',
     '-v'
     ]
+- # Run compatibility tests
+  name: gcr.io/cloud-builders/docker:latest
+  args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/tests/eventlet:${_TAG}',
+         '--no-cache', '/workspace/tests/eventlet/']
 - # Build image to run google client library unit tests
   name: gcr.io/cloud-builders/docker:latest
   args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/tests/google-cloud-python:${_TAG}',
diff --git a/cloudbuild_library_tests.yaml b/cloudbuild_library_tests.yaml
index 846348fe..f547d73f 100644
--- a/cloudbuild_library_tests.yaml
+++ b/cloudbuild_library_tests.yaml
@@ -12,5 +12,9 @@ steps:
     # Avoid warning about unused substitutions
     'UNUSED1=${_BUILDER_DOCKER_NAMESPACE}',
     ]
+- # Run compatibility tests
+  name: gcr.io/cloud-builders/docker:latest
+  args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/tests/eventlet:${_TAG}',
+         '--no-cache', '/workspace/tests/eventlet/']
 images: [
 ]
diff --git a/tests/eventlet/.gitignore b/tests/eventlet/.gitignore
new file mode 100644
index 00000000..14be8077
--- /dev/null
+++ b/tests/eventlet/.gitignore
@@ -0,0 +1,2 @@
+Dockerfile
+main.py
diff --git a/tests/eventlet/Dockerfile.in b/tests/eventlet/Dockerfile.in
new file mode 100644
index 00000000..fa65a236
--- /dev/null
+++ b/tests/eventlet/Dockerfile.in
@@ -0,0 +1,13 @@
+FROM ${STAGING_IMAGE}
+LABEL python_version=python3.6
+RUN virtualenv --no-download /env -p python3.6
+
+# Set virtualenv environment variables. This is equivalent to running
+# source /env/bin/activate
+ENV VIRTUAL_ENV /env
+ENV PATH /env/bin:$PATH
+ADD requirements.txt /app/
+RUN pip install -r requirements.txt
+ADD . /app/
+RUN gunicorn -k eventlet -b :$PORT --daemon main:app ; \
+    wget --retry-connrefused --tries=5 http://localhost:$PORT/
diff --git a/tests/eventlet/README.md b/tests/eventlet/README.md
new file mode 100644
index 00000000..0c2a969c
--- /dev/null
+++ b/tests/eventlet/README.md
@@ -0,0 +1 @@
+# Test the Python base image against the 'eventlet' library
diff --git a/tests/eventlet/requirements.txt b/tests/eventlet/requirements.txt
new file mode 100644
index 00000000..c33e53f2
--- /dev/null
+++ b/tests/eventlet/requirements.txt
@@ -0,0 +1,10 @@
+click==6.7
+enum-compat==0.0.2
+eventlet==0.21.0
+Flask==0.12.2
+greenlet==0.4.12
+gunicorn==19.7.1
+itsdangerous==0.24
+Jinja2==2.9.6
+MarkupSafe==1.0
+Werkzeug==0.12.2