diff --git a/test/common/grpc/grpc_client_integration.h b/test/common/grpc/grpc_client_integration.h
index 1f2bb941d622..e8d63387db6d 100644
--- a/test/common/grpc/grpc_client_integration.h
+++ b/test/common/grpc/grpc_client_integration.h
@@ -25,6 +25,9 @@ class BaseGrpcClientIntegrationParamTest {
   void setGrpcService(envoy::config::core::v3::GrpcService& grpc_service,
                       const std::string& cluster_name,
                       Network::Address::InstanceConstSharedPtr address) {
+    // Set a 5 minute timeout to avoid flakes. If this causes a real test timeout the test is
+    // broken and/or should be using simulated time.
+    grpc_service.mutable_timeout()->CopyFrom(Protobuf::util::TimeUtil::SecondsToDuration(300));
     switch (clientType()) {
     case ClientType::EnvoyGrpc:
       grpc_service.mutable_envoy_grpc()->set_cluster_name(cluster_name);
diff --git a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
index e1d4d2e059ac..9a9446d990ca 100644
--- a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
+++ b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
@@ -475,8 +475,10 @@ class ExtAuthzHttpIntegrationTest : public HttpIntegrationTest,
         {"x-append-bat", "append-foo"}, {"x-append-bat", "append-bar"}};
     EXPECT_THAT(request_nonexisted_headers, Http::IsSubsetOfHeaders(upstream_request_->headers()));
 
+    upstream_request_->encodeHeaders(Http::TestResponseHeaderMapImpl{{":status", "200"}}, true);
     response_->waitForEndStream();
     EXPECT_TRUE(response_->complete());
+    EXPECT_EQ("200", response_->headers().getStatusValue());
 
     cleanup();
   }
@@ -492,7 +494,7 @@ class ExtAuthzHttpIntegrationTest : public HttpIntegrationTest,
     server_uri:
       uri: "ext_authz:9000"
       cluster: "ext_authz"
-      timeout: 0.25s
+      timeout: 300s
 
     authorization_request:
       allowed_headers: