diff --git a/eventarc/generic/Dockerfile b/eventarc/generic/Dockerfile
index cd65c4424..81ef08c64 100644
--- a/eventarc/generic/Dockerfile
+++ b/eventarc/generic/Dockerfile
@@ -16,7 +16,7 @@
 
 # Use the official lightweight Ruby image.
 # https://hub.docker.com/_/ruby
-FROM ruby:2.7-slim
+FROM ruby:2.5-slim
 
 # Install production dependencies.
 WORKDIR /usr/src/app
diff --git a/eventarc/generic/Gemfile.lock b/eventarc/generic/Gemfile.lock
index 0899952b3..fe3299cca 100644
--- a/eventarc/generic/Gemfile.lock
+++ b/eventarc/generic/Gemfile.lock
@@ -62,4 +62,4 @@ DEPENDENCIES
   sinatra (~> 2.0)
 
 BUNDLED WITH
-   2.1.4
+  1.17.3
diff --git a/eventarc/pubsub/Dockerfile b/eventarc/pubsub/Dockerfile
index 8f45d0ef4..6998d8d5e 100644
--- a/eventarc/pubsub/Dockerfile
+++ b/eventarc/pubsub/Dockerfile
@@ -16,7 +16,7 @@
 
 # Use the official lightweight Ruby image.
 # https://hub.docker.com/_/ruby
-FROM ruby:2.7-slim
+FROM ruby:2.5-slim
 
 # Install production dependencies.
 WORKDIR /usr/src/app
diff --git a/eventarc/pubsub/Gemfile.lock b/eventarc/pubsub/Gemfile.lock
index 0899952b3..c9fbc4a5e 100644
--- a/eventarc/pubsub/Gemfile.lock
+++ b/eventarc/pubsub/Gemfile.lock
@@ -9,12 +9,12 @@ GEM
       domain_name (~> 0.5)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -23,27 +23,27 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubysl-securerandom (2.0.0)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     tilt (2.0.10)
     unf (0.1.4)
@@ -62,4 +62,4 @@ DEPENDENCIES
   sinatra (~> 2.0)
 
 BUNDLED WITH
-   2.1.4
+   1.17.3
diff --git a/spec/kokoro-run-all.sh b/spec/kokoro-run-all.sh
index e1317a798..bbb25c96f 100755
--- a/spec/kokoro-run-all.sh
+++ b/spec/kokoro-run-all.sh
@@ -96,22 +96,6 @@ if [[ $CHANGED_DIRS =~ "appengine" ]]; then
   CHANGED_DIRS="${CHANGED_DIRS/appengine/} $AE_CHANGED_DIRS"
 fi
 
-# The run directory has many subdirectories. Only test the modified ones.
-if [[ $CHANGED_DIRS =~ "run" ]]; then
-  AE_CHANGED_DIRS=$(git --no-pager diff --name-only HEAD $(git merge-base HEAD master) | grep "run/" | cut -d/ -f1,2 | sort | uniq || true)
-  CHANGED_DIRS="${CHANGED_DIRS/run/} $AE_CHANGED_DIRS"
-  # Install gcloud for Cloud Run samples if not installing later
-  if [[ ! -n ${RUN_ALL_TESTS:-} ]]; then
-    export PATH="$PATH:/tmp/google-cloud-sdk/bin"
-    ./.kokoro/configure_gcloud.sh
-  fi
-fi
-
-# Most tests in the appengine directory are E2E or always run E2E tests for Cloud Run
-if [[ ($CHANGED_DIRS =~ "appengine" || $CHANGED_DIRS =~ "run") && -n ${RUN_ALL_TESTS:-} ]]; then
-  E2E="true"
-fi
-
 # RUN_ALL_TESTS after this point is used to indicate if we should run tests in every directory,
 # rather than only tests in modified directories.
 RUN_ALL_TESTS="0"
@@ -125,6 +109,11 @@ if [[ $CHANGED_DIRS =~ "spec" || $CHANGED_DIRS =~ ".kokoro" ]]; then
   RUN_ALL_TESTS="1"
 fi
 
+# Most tests in the appengine/run directory are E2E.
+if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" || -n ${RUN_ALL_TESTS:-} ]]; then
+  E2E="true"
+fi
+
 # Start memcached (for appengine/memcache).
 service memcached start