diff --git a/.changelog/12484.txt b/.changelog/12484.txt
new file mode 100644
index 0000000000..42b910df15
--- /dev/null
+++ b/.changelog/12484.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
\ No newline at end of file
diff --git a/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructure_test.go b/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructure_test.go
index 31759450ae..3d33b0fd53 100644
--- a/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructure_test.go
+++ b/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructure_test.go
@@ -23,7 +23,7 @@ func TestAccOracleDatabaseCloudExadataInfrastructure_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "gcp_oracle_zone"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "properties.#"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "properties.0.compute_count"),
-					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "display_name", "ofake-exadata-for-vm display name"),
+					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "display_name", "ofake-do-not-delete-tf-exadata display name"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "gcp_oracle_zone", "us-east4-b-r1"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "properties.0.state", "AVAILABLE"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructure.my-exadata", "properties.0.shape", "Exadata.X9M"),
diff --git a/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructures_test.go b/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructures_test.go
index 9198c4cf8d..e2ce7432d4 100644
--- a/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructures_test.go
+++ b/google-beta/services/oracledatabase/data_source_oracle_database_cloud_exadata_infrastructures_test.go
@@ -27,7 +27,6 @@ func TestAccOracleDatabaseCloudExadataInfrastructures_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructures.my_cloud_exadatas", "cloud_exadata_infrastructures.0.properties.0.cpu_count"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructures.my_cloud_exadatas", "cloud_exadata_infrastructures.0.properties.0.compute_count"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_cloud_exadata_infrastructures.my_cloud_exadatas", "cloud_exadata_infrastructures.0.properties.0.max_cpu_count"),
-					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructures.my_cloud_exadatas", "cloud_exadata_infrastructures.0.properties.0.state", "AVAILABLE"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_cloud_exadata_infrastructures.my_cloud_exadatas", "cloud_exadata_infrastructures.0.properties.0.max_cpu_count", "252"),
 				),
 			},
diff --git a/google-beta/services/oracledatabase/data_source_oracle_database_db_servers_test.go b/google-beta/services/oracledatabase/data_source_oracle_database_db_servers_test.go
index 7f650f9a94..0193fc655c 100644
--- a/google-beta/services/oracledatabase/data_source_oracle_database_db_servers_test.go
+++ b/google-beta/services/oracledatabase/data_source_oracle_database_db_servers_test.go
@@ -24,8 +24,6 @@ func TestAccOracleDatabaseDbServers_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_db_servers.my_db_servers", "db_servers.1.display_name"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_db_servers.my_db_servers", "db_servers.1.properties.#"),
 					resource.TestCheckResourceAttrSet("data.google_oracle_database_db_servers.my_db_servers", "db_servers.1.properties.0.max_ocpu_count"),
-					resource.TestCheckResourceAttr("data.google_oracle_database_db_servers.my_db_servers", "db_servers.0.display_name", "dbServer-1"),
-					resource.TestCheckResourceAttr("data.google_oracle_database_db_servers.my_db_servers", "db_servers.1.display_name", "dbServer-2"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_db_servers.my_db_servers", "db_servers.0.properties.0.max_ocpu_count", "126"),
 					resource.TestCheckResourceAttr("data.google_oracle_database_db_servers.my_db_servers", "db_servers.1.properties.0.max_ocpu_count", "126"),
 				),