diff --git a/ec/acc/deployment_basic_defaults_test.go b/ec/acc/deployment_basic_defaults_test.go
index edcb0eeaf..5a780e8ed 100644
--- a/ec/acc/deployment_basic_defaults_test.go
+++ b/ec/acc/deployment_basic_defaults_test.go
@@ -32,6 +32,8 @@ import (
 // * Resource declaration in the <kind> {} format. ("integrations_server {}").
 // * Topology field overrides over field defaults.
 func TestAccDeployment_basic_defaults_first(t *testing.T) {
+	t.Skip("skip until integrations_server component change is correctly detected https://elasticco.atlassian.net/browse/CP-9334")
+
 	resName := "ec_deployment.defaults"
 	randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
 	startCfg := "testdata/deployment_basic_defaults_1.tf"
diff --git a/ec/acc/deployment_cpu_optimized_test.go b/ec/acc/deployment_cpu_optimized_test.go
index 361cd8032..acc663a91 100644
--- a/ec/acc/deployment_cpu_optimized_test.go
+++ b/ec/acc/deployment_cpu_optimized_test.go
@@ -25,6 +25,8 @@ import (
 )
 
 func TestAccDeployment_cpuOptimized(t *testing.T) {
+	t.Skip("skip until apm component change is correctly detected https://elasticco.atlassian.net/browse/CP-9334")
+
 	resName := "ec_deployment.cpu_optimized"
 	randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
 	startCfg := "testdata/deployment_cpu_optimized_1.tf"
@@ -50,12 +52,7 @@ func TestAccDeployment_cpuOptimized(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
 					resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
 					resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
-					// TODO: remove the apm component for the inital configuration after fixing https://elasticco.atlassian.net/browse/CP-9334
-					resource.TestCheckResourceAttr(resName, "apm.zone_count", "1"),
-					resource.TestCheckResourceAttrSet(resName, "apm.instance_configuration_id"),
-					resource.TestCheckResourceAttr(resName, "apm.size", "1g"),
-					resource.TestCheckResourceAttr(resName, "apm.size_resource", "memory"),
-
+					resource.TestCheckNoResourceAttr(resName, "apm"),
 					resource.TestCheckNoResourceAttr(resName, "enterprise_search"),
 				),
 			},
diff --git a/ec/acc/testdata/deployment_cpu_optimized_1.tf b/ec/acc/testdata/deployment_cpu_optimized_1.tf
index e79f4cee0..2b3f6727b 100644
--- a/ec/acc/testdata/deployment_cpu_optimized_1.tf
+++ b/ec/acc/testdata/deployment_cpu_optimized_1.tf
@@ -16,6 +16,4 @@ resource "ec_deployment" "cpu_optimized" {
   }
 
   kibana = {}
-
-  apm = {}
 }