diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml
new file mode 100644
index 00000000..77803e7c
--- /dev/null
+++ b/cloudbuild-e2e-gae.yaml
@@ -0,0 +1,39 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+  # Wait for the image to exist
+  - name: "docker"
+    id: wait-for-image
+    entrypoint: "sh"
+    timeout: 10m
+    env: ["_TEST_SERVER_IMAGE=${_TEST_SERVER_IMAGE}"]
+    args:
+      - e2e-test-server/wait-for-image.sh
+
+  # Run the test
+  - name: $_TEST_RUNNER_IMAGE
+    id: run-tests-gae
+    dir: /
+    env: ["PROJECT_ID=$PROJECT_ID"]
+    args:
+      - gae
+      - --image=$_TEST_SERVER_IMAGE
+      - --runtime=python
+
+logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
+timeout: 20m
+substitutions:
+  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0
+  _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
diff --git a/e2e-test-server/e2e_test_server/server.py b/e2e-test-server/e2e_test_server/server.py
index 52105630..a26e3f55 100644
--- a/e2e-test-server/e2e_test_server/server.py
+++ b/e2e-test-server/e2e_test_server/server.py
@@ -154,6 +154,18 @@ def pubsub_push() -> None:
     app = Flask(__name__)
     responder = _Responder()
 
+    # Health checks for GAE. See:
+    # https://cloud.google.com/appengine/docs/flexible/reference/app-yaml#updated_health_checks
+    # https://github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/blob/v0.16.0/tf/gae/gae.tf#L32-L38
+    @app.route("/alive")
+    def alive() -> Response:
+        return Response(status=200)
+
+    @app.route("/ready")
+    def ready() -> Response:
+        return Response(status=200)
+
+    # Actual pub/sub handler
     @app.route("/", methods=["POST"])
     def index() -> Response:
         if not request.is_json: