diff --git a/appengine/standard_python37/pubsub/main.py b/appengine/standard_python37/pubsub/main.py
index d144b940e0a..7552dfaee35 100644
--- a/appengine/standard_python37/pubsub/main.py
+++ b/appengine/standard_python37/pubsub/main.py
@@ -19,7 +19,6 @@
 import logging
 import os
 
-from google.auth import jwt
 from google.auth.transport import requests
 from google.cloud import pubsub_v1
 from google.oauth2 import id_token
@@ -38,7 +37,6 @@
 # Global list to store messages, tokens, etc. received by this instance.
 MESSAGES = []
 TOKENS = []
-HEADERS = []
 CLAIMS = []
 
 # [START index]
@@ -46,7 +44,7 @@
 def index():
     if request.method == 'GET':
         return render_template('index.html', messages=MESSAGES, tokens=TOKENS,
-                               headers=HEADERS, claims=CLAIMS)
+                               claims=CLAIMS)
 
     data = request.form.get('payload', 'Example payload').encode('utf-8')
 
@@ -74,18 +72,17 @@ def receive_messages_handler():
         token = bearer_token.split(' ')[1]
         TOKENS.append(token)
 
-        header = jwt.decode_header(token)
-        HEADERS.append(header)
-
-        # Verify and decode the JWT. Underneath it checks the signature against
-        # Google's public certs at https://www.googleapis.com/oauth2/v1/certs.
-        # It also checks the token expiration time.
-        claim = id_token.verify_oauth2_token(token, requests.Request())
+        # Verify and decode the JWT. `verify_oauth2_token` verifies
+        # the JWT signature, the `aud` claim, and the `exp` claim.
+        claim = id_token.verify_oauth2_token(token, requests.Request(),
+                                             audience='example.com')
+        # Must also verify the `iss` claim.
+        if claim['iss'] not in [
+            'accounts.google.com',
+            'https://accounts.google.com'
+        ]:
+            raise ValueError('Wrong issuer.')
         CLAIMS.append(claim)
-
-        # Check the audience field in the claim. It was specified in
-        # `--push-auth-token-audience` when you created the subscription.
-        assert claim['aud'] == 'example.com'
     except Exception as e:
         return 'Invalid token: {}\n'.format(e), 400
 
diff --git a/appengine/standard_python37/pubsub/main_test.py b/appengine/standard_python37/pubsub/main_test.py
index fdc38faa384..66601db0e00 100644
--- a/appengine/standard_python37/pubsub/main_test.py
+++ b/appengine/standard_python37/pubsub/main_test.py
@@ -70,7 +70,7 @@ def fake_token(signer):
     yield jwt.encode(signer, payload, header=header)
 
 
-def _verify_mocked_oauth2_token(token, request):
+def _verify_mocked_oauth2_token(token, request, audience):
     claims = jwt.decode(token, certs=PUBLIC_CERT_BYTES, verify=True)
     return claims
 
diff --git a/appengine/standard_python37/pubsub/templates/index.html b/appengine/standard_python37/pubsub/templates/index.html
index eba418842bf..9323b6b2f42 100644
--- a/appengine/standard_python37/pubsub/templates/index.html
+++ b/appengine/standard_python37/pubsub/templates/index.html
@@ -25,11 +25,6 @@
       <li>{{token}}</li>
     {% endfor %}
   </p>
-  <p>Print HEADERS:
-    {% for header in headers: %}
-      <li>{{header}}</li>
-    {% endfor %}
-  </p>
   <p>Print CLAIMS:
     {% for claim in claims: %}
       <li>{{claim}}</li>