diff --git a/test/nginx_system_test.sh b/test/nginx_system_test.sh
index 1362dcf2d..efae23001 100644
--- a/test/nginx_system_test.sh
+++ b/test/nginx_system_test.sh
@@ -1263,6 +1263,7 @@ OUT=$(cat "test/tmp/error.log" \
     | grep -v "\\[error\\].*Failed to make directory*" \
     | grep -v "\\[error\\].*Could not create directories*" \
     | grep -v "\\[error\\].*opening temp file: No such file or directory.*" \
+    | grep -v "\\[error\\].*unexpected response.*" \
     || true)
 
 check [ -z "$OUT" ]
diff --git a/test/pagespeed_test.conf.template b/test/pagespeed_test.conf.template
index 425d4e726..4f68513e8 100644
--- a/test/pagespeed_test.conf.template
+++ b/test/pagespeed_test.conf.template
@@ -40,7 +40,7 @@ http {
   pagespeed MessageBufferSize 200000;
   # Increase the default fetcher timeout to resolve sporadic flakeyness when
   # the native fetcher uses 8.8.8.8 to resolve.
-  pagespeed FetcherTimeoutMs 10000;
+  pagespeed FetcherTimeoutMs 30000;
   pagespeed NativeFetcherMaxKeepaliveRequests 50;
 
   root "@@SERVER_ROOT@@";