diff --git a/pkg/resources/schema_acceptance_test.go b/pkg/resources/schema_acceptance_test.go
index a5f8b1536c..4d1ebfd35b 100644
--- a/pkg/resources/schema_acceptance_test.go
+++ b/pkg/resources/schema_acceptance_test.go
@@ -550,12 +550,14 @@ func TestAcc_Schema_TwoSchemasWithTheSameNameOnDifferentDatabases(t *testing.T)
 
 // proves https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2356 issue is fixed.
 func TestAcc_Schema_DefaultDataRetentionTime(t *testing.T) {
-	databaseId := acc.TestClient().Ids.DatabaseId()
-	id := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
+	db, dbCleanup := acc.TestClient().Database.CreateDatabase(t)
+	t.Cleanup(dbCleanup)
+
+	id := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(db.ID())
 
 	configVariablesWithoutSchemaDataRetentionTime := func() config.Variables {
 		return config.Variables{
-			"database": config.StringVariable(databaseId.Name()),
+			"database": config.StringVariable(db.ID().Name()),
 			"schema":   config.StringVariable(id.Name()),
 		}
 	}
@@ -584,7 +586,7 @@ func TestAcc_Schema_DefaultDataRetentionTime(t *testing.T) {
 			// change param value in database
 			{
 				PreConfig: func() {
-					acc.TestClient().Database.UpdateDataRetentionTime(t, databaseId, 50)
+					acc.TestClient().Database.UpdateDataRetentionTime(t, db.ID(), 50)
 				},
 				ConfigDirectory: acc.ConfigurationDirectory("TestAcc_Schema_DefaultDataRetentionTime/WithoutDataRetentionSet"),
 				ConfigVariables: configVariablesWithoutSchemaDataRetentionTime(),
diff --git a/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithSchemaDataRetentionSet/test.tf b/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithSchemaDataRetentionSet/test.tf
index b8576b58af..30c3360a8f 100644
--- a/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithSchemaDataRetentionSet/test.tf
+++ b/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithSchemaDataRetentionSet/test.tf
@@ -4,9 +4,9 @@ resource "snowflake_database" "test" {
 }
 
 resource "snowflake_schema" "test" {
-  database            = snowflake_database.test.name
-  name                = var.schema
-  data_retention_days = var.schema_data_retention_time
+  database                    = snowflake_database.test.name
+  name                        = var.schema
+  data_retention_time_in_days = var.schema_data_retention_time
 }
 
 resource "snowflake_table" "test" {
diff --git a/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithTableDataRetentionSet/test.tf b/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithTableDataRetentionSet/test.tf
index f417315d00..05571c1112 100644
--- a/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithTableDataRetentionSet/test.tf
+++ b/pkg/resources/testdata/TestAcc_Table_DefaultDataRetentionTime/WithTableDataRetentionSet/test.tf
@@ -4,9 +4,9 @@ resource "snowflake_database" "test" {
 }
 
 resource "snowflake_schema" "test" {
-  database            = snowflake_database.test.name
-  name                = var.schema
-  data_retention_days = var.schema_data_retention_time
+  database                    = snowflake_database.test.name
+  name                        = var.schema
+  data_retention_time_in_days = var.schema_data_retention_time
 }
 
 resource "snowflake_table" "test" {