diff --git a/storage/grpc_client.go b/storage/grpc_client.go
index 11f3c6ca7001..a9888b727082 100644
--- a/storage/grpc_client.go
+++ b/storage/grpc_client.go
@@ -1,11 +1,10 @@
-// go:build grpc
 // Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//	http://www.apache.org/licenses/LICENSE-2.0
+//      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -120,8 +119,8 @@ func newGRPCStorageClient(ctx context.Context, opts ...storageOption) (storageCl
 	s.clientOption = append(defaultGRPCOptions(), s.clientOption...)
 	// Disable all gax-level retries in favor of retry logic in the veneer client.
 	s.gax = append(s.gax, gax.WithRetry(nil))
-	config := newStorageConfig(s.clientOption...)
 
+	config := newStorageConfig(s.clientOption...)
 	if config.readAPIWasSet {
 		return nil, errors.New("storage: GRPC is incompatible with any option that specifies an API for reads")
 	}
diff --git a/storage/grpc_metrics_test.go b/storage/grpc_metrics_test.go
index 2cf980d12d33..e3c0822c84e8 100644
--- a/storage/grpc_metrics_test.go
+++ b/storage/grpc_metrics_test.go
@@ -28,6 +28,9 @@ import (
 )
 
 func TestMetrics(t *testing.T) {
+	if testing.Short() && !replaying {
+		t.Skip("Integration tests skipped in short mode")
+	}
 	ctx := context.Background()
 	grpcClient, err := NewGRPCClient(ctx)
 	if err != nil {