diff --git a/storage/tests/system.py b/storage/tests/system.py
index 6aa68aee0628..473c48b543d6 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -1683,6 +1683,7 @@ def test_new_bucket_w_bpo(self):
         with self.assertRaises(exceptions.BadRequest):
             blob_acl.save()
 
+    @unittest.skipUnless(False, "Back-end fix for BPO/UBLA expected 2019-07-12")
     def test_bpo_set_unset_preserves_acls(self):
         new_bucket_name = "bpo-acls" + unique_resource_id("-")
         self.assertRaises(
@@ -1704,6 +1705,8 @@ def test_bpo_set_unset_preserves_acls(self):
         bucket.iam_configuration.bucket_policy_only_enabled = True
         bucket.patch()
 
+        self.assertTrue(bucket.iam_configuration.bucket_policy_only_enabled)
+
         # While BPO is set, cannot get / set ACLs
         with self.assertRaises(exceptions.BadRequest):
             bucket.acl.reload()