diff --git a/internal/provider/cluster/cluster_licensing_license_alias_test.go b/internal/provider/cluster/cluster_licensing_license_alias_test.go
index d9ce73db..8fddf9f8 100644
--- a/internal/provider/cluster/cluster_licensing_license_alias_test.go
+++ b/internal/provider/cluster/cluster_licensing_license_alias_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestLicensingLicenseResouceAlias(t *testing.T) {
 	testLicense := os.Getenv("TF_ACC_NETAPP_LICENSE")
-	name := "FCP"
+	name := "NFS"
 	credName := "cluster4"
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { ntest.TestAccPreCheck(t) },
@@ -40,11 +40,11 @@ func TestLicensingLicenseResouceAlias(t *testing.T) {
 }
 
 func testAccLicensingLicenseResourceConfigAlias(key string) string {
-	host := os.Getenv("TF_ACC_NETAPP_HOST")
+	host := os.Getenv("TF_ACC_NETAPP_HOST5")
 	admin := os.Getenv("TF_ACC_NETAPP_USER")
-	password := os.Getenv("TF_ACC_NETAPP_PASS")
+	password := os.Getenv("TF_ACC_NETAPP_PASS2")
 	if host == "" || admin == "" || password == "" {
-		fmt.Println("TF_ACC_NETAPP_HOST, TF_ACC_NETAPP_USER, and TF_ACC_NETAPP_PASS must be set for acceptance tests")
+		fmt.Println("TF_ACC_NETAPP_HOST5, TF_ACC_NETAPP_USER, and TF_ACC_NETAPP_PASS2 must be set for acceptance tests")
 		os.Exit(1)
 	}
 	return fmt.Sprintf(`
diff --git a/internal/provider/cluster/cluster_licensing_license_test.go b/internal/provider/cluster/cluster_licensing_license_test.go
index 59b0cc6a..8e9af1dd 100644
--- a/internal/provider/cluster/cluster_licensing_license_test.go
+++ b/internal/provider/cluster/cluster_licensing_license_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestLicensingLicenseResouce(t *testing.T) {
 	testLicense := os.Getenv("TF_ACC_NETAPP_LICENSE")
-	name := "FCP"
+	name := "NFS"
 	credName := "cluster4"
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { ntest.TestAccPreCheck(t) },
@@ -40,11 +40,11 @@ func TestLicensingLicenseResouce(t *testing.T) {
 }
 
 func testAccLicensingLicenseResourceConfig(key string) string {
-	host := os.Getenv("TF_ACC_NETAPP_HOST")
+	host := os.Getenv("TF_ACC_NETAPP_HOST5")
 	admin := os.Getenv("TF_ACC_NETAPP_USER")
-	password := os.Getenv("TF_ACC_NETAPP_PASS")
+	password := os.Getenv("TF_ACC_NETAPP_PASS2")
 	if host == "" || admin == "" || password == "" {
-		fmt.Println("TF_ACC_NETAPP_HOST, TF_ACC_NETAPP_USER, and TF_ACC_NETAPP_PASS must be set for acceptance tests")
+		fmt.Println("TF_ACC_NETAPP_HOST5, TF_ACC_NETAPP_USER, and TF_ACC_NETAPP_PASS2 must be set for acceptance tests")
 		os.Exit(1)
 	}
 	return fmt.Sprintf(`
diff --git a/internal/provider/protocols/protocols_san_lun-map_resource_alias_test.go b/internal/provider/protocols/protocols_san_lun-map_resource_alias_test.go
index 0b3b4e10..d2ee7ca2 100644
--- a/internal/provider/protocols/protocols_san_lun-map_resource_alias_test.go
+++ b/internal/provider/protocols/protocols_san_lun-map_resource_alias_test.go
@@ -18,7 +18,7 @@ func TestAccProtocolsSanLunMapResourceAlias(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Test non existant
 			{
-				Config:      testAccProtocolsSanLunMapResourceBasicConfig("/vol/abc/ACC-import-lun", "abc", "abc"),
+				Config:      testAccProtocolsSanLunMapResourceBasicConfigAlias("/vol/abc/ACC-import-lun", "abc", "abc"),
 				ExpectError: regexp.MustCompile("2621462"),
 			},
 			// Create protocols_san_lun-maps and read