diff --git a/azure_storage_client_test.go b/azure_storage_client_test.go
index 830378bb3..601b989fe 100644
--- a/azure_storage_client_test.go
+++ b/azure_storage_client_test.go
@@ -21,11 +21,11 @@ import (
 func TestExtractContainerNameAndPath(t *testing.T) {
 	azureUtil := new(snowflakeAzureClient)
 	testcases := []tcBucketPath{
-		{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
-		{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
-		{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
-		{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
-		{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
+		{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
+		{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
+		{"sfc-eng-regression/", "sfc-eng-regression", ""},
+		{"sfc-eng-regression//", "sfc-eng-regression", "/"},
+		{"sfc-eng-regression///", "sfc-eng-regression", "//"},
 	}
 	for _, test := range testcases {
 		t.Run(test.in, func(t *testing.T) {
diff --git a/gcs_storage_client_test.go b/gcs_storage_client_test.go
index 7798e61dd..75b5f50f7 100644
--- a/gcs_storage_client_test.go
+++ b/gcs_storage_client_test.go
@@ -23,11 +23,11 @@ type tcFileURL struct {
 func TestExtractBucketAndPath(t *testing.T) {
 	gcsUtil := new(snowflakeGcsClient)
 	testcases := []tcBucketPath{
-		{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
-		{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
-		{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
-		{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
-		{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
+		{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
+		{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
+		{"sfc-eng-regression/", "sfc-eng-regression", ""},
+		{"sfc-eng-regression//", "sfc-eng-regression", "/"},
+		{"sfc-eng-regression///", "sfc-eng-regression", "//"},
 	}
 	for _, test := range testcases {
 		t.Run(test.in, func(t *testing.T) {
@@ -97,11 +97,11 @@ func TestIsTokenExpiredWith404(t *testing.T) {
 func TestGenerateFileURL(t *testing.T) {
 	gcsUtil := new(snowflakeGcsClient)
 	testcases := []tcFileURL{
-		{"sfc-dev1-regression/test_sub_dir/", "file1", "sfc-dev1-regression", "test_sub_dir/file1"},
-		{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "file2", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/file2"},
-		{"sfc-dev1-regression/", "file3", "sfc-dev1-regression", "file3"},
-		{"sfc-dev1-regression//", "file4", "sfc-dev1-regression", "/file4"},
-		{"sfc-dev1-regression///", "file5", "sfc-dev1-regression", "//file5"},
+		{"sfc-eng-regression/test_sub_dir/", "file1", "sfc-eng-regression", "test_sub_dir/file1"},
+		{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "file2", "sfc-eng-regression", "dir/test_stg/test_sub_dir/file2"},
+		{"sfc-eng-regression/", "file3", "sfc-eng-regression", "file3"},
+		{"sfc-eng-regression//", "file4", "sfc-eng-regression", "/file4"},
+		{"sfc-eng-regression///", "file5", "sfc-eng-regression", "//file5"},
 	}
 	for _, test := range testcases {
 		t.Run(test.location, func(t *testing.T) {
diff --git a/ocsp_test.go b/ocsp_test.go
index 1d42ae2c0..94c2dc847 100644
--- a/ocsp_test.go
+++ b/ocsp_test.go
@@ -30,7 +30,7 @@ func TestOCSP(t *testing.T) {
 	targetURL := []string{
 		"https://sfctest0.snowflakecomputing.com/",
 		"https://s3-us-west-2.amazonaws.com/sfc-snowsql-updates/?prefix=1.1/windows_x86_64",
-		"https://sfcdev1.blob.core.windows.net/",
+		"https://sfcdev2.blob.core.windows.net/",
 	}
 
 	transports := []*http.Transport{
@@ -128,7 +128,7 @@ func TestUnitEncodeCertIDGood(t *testing.T) {
 	targetURLs := []string{
 		"faketestaccount.snowflakecomputing.com:443",
 		"s3-us-west-2.amazonaws.com:443",
-		"sfcdev1.blob.core.windows.net:443",
+		"sfcdev2.blob.core.windows.net:443",
 	}
 	for _, tt := range targetURLs {
 		t.Run(tt, func(t *testing.T) {
diff --git a/put_get_test.go b/put_get_test.go
index ba4c7a3ff..730efbcbb 100644
--- a/put_get_test.go
+++ b/put_get_test.go
@@ -145,7 +145,7 @@ func getAWSCredentials() (string, string, string, error) {
 		if err != nil {
 			return keyID, secretKey, "", err
 		}
-		bucket = fmt.Sprintf("sfc-dev1-regression/%v/reg", user.Username)
+		bucket = fmt.Sprintf("sfc-eng-regression/%v/reg", user.Username)
 	}
 	return keyID, secretKey, bucket, nil
 }
diff --git a/put_get_user_stage_test.go b/put_get_user_stage_test.go
index be64e0100..1f8021f77 100644
--- a/put_get_user_stage_test.go
+++ b/put_get_user_stage_test.go
@@ -57,7 +57,7 @@ func putGetUserStage(t *testing.T, tmpDir string, numberOfFiles int, numberOfLin
 		dbt.mustExec(fmt.Sprintf(sqlText, dbname))
 		userBucket := os.Getenv("SF_AWS_USER_BUCKET")
 		if userBucket == "" {
-			userBucket = fmt.Sprintf("sfc-dev1-regression/%v/reg", username)
+			userBucket = fmt.Sprintf("sfc-eng-regression/%v/reg", username)
 		}
 		sqlText = `create or replace stage %v url='s3://%v}/%v-%v-%v'
 			credentials = (AWS_KEY_ID='%v' AWS_SECRET_KEY='%v')`
diff --git a/put_get_with_aws_test.go b/put_get_with_aws_test.go
index 61b469a25..b02fd27a8 100644
--- a/put_get_with_aws_test.go
+++ b/put_get_with_aws_test.go
@@ -66,7 +66,7 @@ func TestLoadS3(t *testing.T) {
 		dbt.mustQueryAssertCount("ls @%tweets", 0)
 
 		rows := dbt.mustQuery(fmt.Sprintf(`copy into tweets from
-			s3://sfc-dev1-data/twitter/O1k/tweets/ credentials=(AWS_KEY_ID='%v'
+			s3://sfc-eng-data/twitter/O1k/tweets/ credentials=(AWS_KEY_ID='%v'
 			AWS_SECRET_KEY='%v') file_format=(skip_header=1 null_if=('')
 			field_optionally_enclosed_by='\"')`,
 			data.awsAccessKeyID, data.awsSecretAccessKey))
@@ -80,7 +80,7 @@ func TestLoadS3(t *testing.T) {
 		if cnt != 1 {
 			t.Fatal("copy into tweets did not set row count to 1")
 		}
-		if s0 != "s3://sfc-dev1-data/twitter/O1k/tweets/1.csv.gz" {
+		if s0 != "s3://sfc-eng-data/twitter/O1k/tweets/1.csv.gz" {
 			t.Fatalf("got %v as file", s0)
 		}
 	})
diff --git a/s3_storage_client_test.go b/s3_storage_client_test.go
index 06cd1b119..8843dcdbf 100644
--- a/s3_storage_client_test.go
+++ b/s3_storage_client_test.go
@@ -26,11 +26,11 @@ type tcBucketPath struct {
 func TestExtractBucketNameAndPath(t *testing.T) {
 	s3util := new(snowflakeS3Client)
 	testcases := []tcBucketPath{
-		{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
-		{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
-		{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
-		{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
-		{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
+		{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
+		{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
+		{"sfc-eng-regression/", "sfc-eng-regression", ""},
+		{"sfc-eng-regression//", "sfc-eng-regression", "/"},
+		{"sfc-eng-regression///", "sfc-eng-regression", "//"},
 	}
 	for _, test := range testcases {
 		t.Run(test.in, func(t *testing.T) {