diff --git a/noxfile.py b/noxfile.py
index 9dffc28b8..c217cfefa 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -152,13 +152,13 @@ def system(session):
     # Run py.test against the system tests.
     if system_test_exists:
         session.run(
-            "py.test", "--quiet", "--reruns=7", system_test_path, *session.posargs
+            "py.test", "--quiet", "--reruns=2", system_test_path, *session.posargs
         )
     if system_test_folder_exists:
         session.run(
             "py.test",
             "--quiet",
-            "--reruns=7",
+            "--reruns=2",
             system_test_folder_path,
             *session.posargs,
         )
diff --git a/tests/system/test_blob.py b/tests/system/test_blob.py
index 5046159fd..37e454737 100644
--- a/tests/system/test_blob.py
+++ b/tests/system/test_blob.py
@@ -97,6 +97,10 @@ def test_large_file_write_from_stream_w_failed_checksum(
     assert not blob.exists()
 
 
+@pytest.mark.skipif(
+    _helpers.is_api_endpoint_override,
+    reason="Test does not yet support endpoint override",
+)
 def test_large_file_write_from_stream_w_encryption_key(
     storage_client,
     shared_bucket,
diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py
index a47c1eaf9..005b51f7b 100644
--- a/tests/system/test_bucket.py
+++ b/tests/system/test_bucket.py
@@ -123,6 +123,7 @@ def test_bucket_lifecycle_rules(storage_client, buckets_to_delete):
     assert list(bucket.lifecycle_rules) == []
 
 
+@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
 def test_bucket_update_labels(storage_client, buckets_to_delete):
     bucket_name = _helpers.unique_name("update-labels")
     bucket = _helpers.retry_429_503(storage_client.create_bucket)(bucket_name)
@@ -617,6 +618,7 @@ def test_bucket_list_blobs_hierarchy_w_include_trailing_delimiter(
     assert iterator.prefixes == expected_prefixes
 
 
+@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
 def test_bucket_w_retention_period(
     storage_client,
     buckets_to_delete,
@@ -796,6 +798,7 @@ def test_bucket_lock_retention_policy(
         bucket.patch()
 
 
+@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
 def test_new_bucket_w_ubla(
     storage_client,
     buckets_to_delete,