diff --git a/jobs/v3/api_client/auto_complete_sample_test.py b/jobs/v3/api_client/auto_complete_sample_test.py
index 8f2458e1e6b..1b51e5dfab5 100755
--- a/jobs/v3/api_client/auto_complete_sample_test.py
+++ b/jobs/v3/api_client/auto_complete_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_auto_complete_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         auto_complete_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/commute_search_sample_test.py b/jobs/v3/api_client/commute_search_sample_test.py
index 5a99527f3e7..a862afdee08 100755
--- a/jobs/v3/api_client/commute_search_sample_test.py
+++ b/jobs/v3/api_client/commute_search_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_commute_search_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         commute_search_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/custom_attribute_sample_test.py b/jobs/v3/api_client/custom_attribute_sample_test.py
index 7ccc47e90c0..5e92aee3c54 100755
--- a/jobs/v3/api_client/custom_attribute_sample_test.py
+++ b/jobs/v3/api_client/custom_attribute_sample_test.py
@@ -28,7 +28,7 @@ def create_data():
 
 
 def test_custom_attribute_sample(create_data, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         custom_attribute_sample.run_sample()
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/email_alert_search_sample_test.py b/jobs/v3/api_client/email_alert_search_sample_test.py
index 08cf6695fbd..25c05a6a868 100755
--- a/jobs/v3/api_client/email_alert_search_sample_test.py
+++ b/jobs/v3/api_client/email_alert_search_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_email_alert_search_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         email_alert_search_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/featured_job_search_sample_test.py b/jobs/v3/api_client/featured_job_search_sample_test.py
index 730bcb65aeb..5524043b862 100755
--- a/jobs/v3/api_client/featured_job_search_sample_test.py
+++ b/jobs/v3/api_client/featured_job_search_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_featured_job_search_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         featured_job_search_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/general_search_sample_test.py b/jobs/v3/api_client/general_search_sample_test.py
index 16b043d044a..9b0fd86059e 100755
--- a/jobs/v3/api_client/general_search_sample_test.py
+++ b/jobs/v3/api_client/general_search_sample_test.py
@@ -28,7 +28,7 @@ def company_and_job():
 
 
 def test_general_search_sample(company_and_job, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         general_search_sample.run_sample(
             company_and_job[0], company_and_job[1])
diff --git a/jobs/v3/api_client/histogram_sample_test.py b/jobs/v3/api_client/histogram_sample_test.py
index 5776f5b90a8..7cfe92f71ec 100755
--- a/jobs/v3/api_client/histogram_sample_test.py
+++ b/jobs/v3/api_client/histogram_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_histogram_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         histogram_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/location_search_sample_test.py b/jobs/v3/api_client/location_search_sample_test.py
index 3dae1965a63..e7bad1c1825 100755
--- a/jobs/v3/api_client/location_search_sample_test.py
+++ b/jobs/v3/api_client/location_search_sample_test.py
@@ -28,7 +28,7 @@ def company_name():
 
 
 def test_location_search_sample(company_name, capsys):
-    @eventually_consistent.call
+    @eventually_consistent.call(tries=5)
     def _():
         location_search_sample.run_sample(company_name)
         out, _ = capsys.readouterr()
diff --git a/jobs/v3/api_client/requirements-test.txt b/jobs/v3/api_client/requirements-test.txt
index 7531bd92a5e..373e02e2fd8 100644
--- a/jobs/v3/api_client/requirements-test.txt
+++ b/jobs/v3/api_client/requirements-test.txt
@@ -1,4 +1,3 @@
 pytest==5.3.2
-gcp-devrel-py-tools==0.0.15
-google-cloud-core
+gcp-devrel-py-tools==0.0.16
 flaky==3.6.1