diff --git a/deployment/ccip/changeset/test_helpers.go b/deployment/ccip/changeset/test_helpers.go
index 251bff293d5..d594e0decaa 100644
--- a/deployment/ccip/changeset/test_helpers.go
+++ b/deployment/ccip/changeset/test_helpers.go
@@ -308,13 +308,15 @@ func NewMemoryEnvironmentWithJobsAndContracts(t *testing.T, lggr logger.Logger,
 	var usdcCfg USDCAttestationConfig
 	if len(usdcChains) > 0 {
 		server := mockAttestationResponse()
-		defer server.Close()
 		endpoint := server.URL
 		usdcCfg = USDCAttestationConfig{
 			API:         endpoint,
 			APITimeout:  commonconfig.MustNewDuration(time.Second),
 			APIInterval: commonconfig.MustNewDuration(500 * time.Millisecond),
 		}
+		t.Cleanup(func() {
+			server.Close()
+		})
 	}
 
 	// Deploy second set of changesets to deploy and configure the CCIP contracts.
diff --git a/integration-tests/smoke/ccip/ccip_usdc_test.go b/integration-tests/smoke/ccip/ccip_usdc_test.go
index ccc97a72715..1f2cb28b4af 100644
--- a/integration-tests/smoke/ccip/ccip_usdc_test.go
+++ b/integration-tests/smoke/ccip/ccip_usdc_test.go
@@ -26,9 +26,11 @@ import (
 
 func TestUSDCTokenTransfer(t *testing.T) {
 	lggr := logger.TestLogger(t)
-	tenv, _, _ := testsetups.NewLocalDevEnvironmentWithDefaultPrice(t, lggr, &changeset.TestConfigs{
+	config := &changeset.TestConfigs{
 		IsUSDC: true,
-	})
+	}
+	tenv, _, _ := testsetups.NewLocalDevEnvironmentWithDefaultPrice(t, lggr, config)
+	//tenv := changeset.NewMemoryEnvironmentWithJobsAndContracts(t, lggr, 2, 4, config)
 
 	e := tenv.Env
 	state, err := changeset.LoadOnchainState(e)