diff --git a/test/integration/build/gcp-mm.tf b/test/integration/build/gcp-mm.tf
index 60f8926e5..1d2418975 100644
--- a/test/integration/build/gcp-mm.tf
+++ b/test/integration/build/gcp-mm.tf
@@ -220,7 +220,7 @@ variable "cloud_composer_v1" {
   type = any
 }
 
-variable "organization_envgroup_attachment" {
+variable "apigee_organization_envgroup_attachment" {
   type = any
 }
 
@@ -1571,6 +1571,6 @@ resource "google_composer_v1_environment" "test" {
 }
 
 resource "google_apigee_envgroup_attachment" "engroup_attachment" {
-  envgroup_id  = var.organization_envgroup_attachment.envgroup_id
-  environment  = var.organization_envgroup_attachment.environment
+  envgroup_id  = var.apigee_organization_envgroup_attachment.envgroup_id
+  environment  = var.apigee_organization_envgroup_attachment.environment
 }
diff --git a/test/integration/configuration/mm-attributes.yml b/test/integration/configuration/mm-attributes.yml
index 65b01023e..d3a3e98c3 100644
--- a/test/integration/configuration/mm-attributes.yml
+++ b/test/integration/configuration/mm-attributes.yml
@@ -563,6 +563,6 @@ cloud_composer_v1:
   region : "us-central1"
   image_version : "composer-1.20.12-airflow-2.4.3"
 
-organization_envgroup_attachment:
+apigee_organization_envgroup_attachment:
   envgroup_id: "organizations/ppradhan/envgroups/test-env-group"
   environment: "test-env"