diff --git a/google/cloud/storage/internal/async/writer_connection_impl_test.cc b/google/cloud/storage/internal/async/writer_connection_impl_test.cc
index 7d5c40a902a10..ebf2df07e2181 100644
--- a/google/cloud/storage/internal/async/writer_connection_impl_test.cc
+++ b/google/cloud/storage/internal/async/writer_connection_impl_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// TODO(#16404): Remove deprecation disable include.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/async/writer_connection_impl.h"
 #include "google/cloud/mocks/mock_async_streaming_read_write_rpc.h"
 #include "google/cloud/storage/async/options.h"
diff --git a/google/cloud/storage/internal/checksum_helpers_test.cc b/google/cloud/storage/internal/checksum_helpers_test.cc
index 8cdfea963674e..7a0394ba5e1c9 100644
--- a/google/cloud/storage/internal/checksum_helpers_test.cc
+++ b/google/cloud/storage/internal/checksum_helpers_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// TODO(#16404): Remove deprecation disable include.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/checksum_helpers.h"
 #include "google/cloud/storage/internal/object_requests.h"
 #include <gtest/gtest.h>
diff --git a/google/cloud/storage/internal/object_requests_test.cc b/google/cloud/storage/internal/object_requests_test.cc
index e9cbe0a85e7d0..1d45967ba28a3 100644
--- a/google/cloud/storage/internal/object_requests_test.cc
+++ b/google/cloud/storage/internal/object_requests_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// TODO(#16404): Remove deprecation disable include.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/object_requests.h"
 #include "google/cloud/storage/internal/object_access_control_parser.h"
 #include "google/cloud/storage/internal/object_acl_requests.h"
@@ -189,7 +191,6 @@ TEST(ObjectRequestsTest, InsertObjectMediaUpdateContents) {
   EXPECT_EQ("new contents", request.payload());
 }
 
-#include "google/cloud/internal/disable_deprecation_warnings.inc"
 TEST(ObjectRequestsTest, InsertObjectBackwardsCompat) {
   auto const payload =
       std::string("The quick brown fox jumps over the lazy dog");
@@ -201,7 +202,6 @@ TEST(ObjectRequestsTest, InsertObjectBackwardsCompat) {
   EXPECT_EQ(zebras, request.payload());
   EXPECT_EQ(zebras, request.contents());
 }
-#include "google/cloud/internal/diagnostics_pop.inc"
 
 TEST(ObjectRequestsTest, Copy) {
   CopyObjectRequest request("source-bucket", "source-object", "my-bucket",
diff --git a/google/cloud/storage/internal/signed_url_requests_test.cc b/google/cloud/storage/internal/signed_url_requests_test.cc
index 82374c50cdc3b..283cdf77800de 100644
--- a/google/cloud/storage/internal/signed_url_requests_test.cc
+++ b/google/cloud/storage/internal/signed_url_requests_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// TODO(#16404): Remove deprecation disable include.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/signed_url_requests.h"
 #include "google/cloud/internal/format_time_point.h"
 #include "google/cloud/internal/parse_rfc3339.h"