diff --git a/.changes/README.md b/.changes/README.md
new file mode 100644
index 0000000000..0f89a5960d
--- /dev/null
+++ b/.changes/README.md
@@ -0,0 +1,10 @@
+# Changelog process
+
+We use [Changie](https://changie.dev/) to manage our changelog. 
+We support PRs to three branches, which all have their own changelog folders:
+
+- **N-1**: latest maintenance release -> `.changes/current`
+- **N**: upcoming release -> `.changes/next`
+- **N+1**: next release -> `.changes/dev`
+
+
diff --git a/.changes/unreleased/.gitkeep b/.changes/dev/.gitkeep
similarity index 100%
rename from .changes/unreleased/.gitkeep
rename to .changes/dev/.gitkeep
diff --git a/.changes/unreleased/BUG FIXES-20250123-135228.yaml b/.changes/dev/BUG FIXES-20250123-135228.yaml
similarity index 100%
rename from .changes/unreleased/BUG FIXES-20250123-135228.yaml
rename to .changes/dev/BUG FIXES-20250123-135228.yaml
diff --git a/.changes/unreleased/BUG FIXES-20250123-150746.yaml b/.changes/dev/BUG FIXES-20250123-150746.yaml
similarity index 100%
rename from .changes/unreleased/BUG FIXES-20250123-150746.yaml
rename to .changes/dev/BUG FIXES-20250123-150746.yaml
diff --git a/.changes/unreleased/BUG FIXES-20250210-163038.yaml b/.changes/dev/BUG FIXES-20250210-163038.yaml
similarity index 100%
rename from .changes/unreleased/BUG FIXES-20250210-163038.yaml
rename to .changes/dev/BUG FIXES-20250210-163038.yaml
diff --git a/.changes/unreleased/ENHANCEMENTS-20250123-101838.yaml b/.changes/dev/ENHANCEMENTS-20250123-101838.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250123-101838.yaml
rename to .changes/dev/ENHANCEMENTS-20250123-101838.yaml
diff --git a/.changes/unreleased/ENHANCEMENTS-20250203-170319.yaml b/.changes/dev/ENHANCEMENTS-20250203-170319.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250203-170319.yaml
rename to .changes/dev/ENHANCEMENTS-20250203-170319.yaml
diff --git a/.changes/unreleased/ENHANCEMENTS-20250204-182544.yaml b/.changes/dev/ENHANCEMENTS-20250204-182544.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250204-182544.yaml
rename to .changes/dev/ENHANCEMENTS-20250204-182544.yaml
diff --git a/.changes/unreleased/ENHANCEMENTS-20250205-104144.yaml b/.changes/dev/ENHANCEMENTS-20250205-104144.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250205-104144.yaml
rename to .changes/dev/ENHANCEMENTS-20250205-104144.yaml
diff --git a/.changes/dev/ENHANCEMENTS-20250206-162053.yaml b/.changes/dev/ENHANCEMENTS-20250206-162053.yaml
new file mode 100644
index 0000000000..9e20b9cbf7
--- /dev/null
+++ b/.changes/dev/ENHANCEMENTS-20250206-162053.yaml
@@ -0,0 +1,5 @@
+kind: ENHANCEMENTS
+body: "Terraform Test: Continue subsequent test execution when an expected failure is not encountered."
+time: 2025-02-06T16:20:53.83763+01:00
+custom:
+    Issue: "34969"
diff --git a/.changes/unreleased/ENHANCEMENTS-20250206-34969.yaml b/.changes/dev/ENHANCEMENTS-20250206-34969.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250206-34969.yaml
rename to .changes/dev/ENHANCEMENTS-20250206-34969.yaml
diff --git a/.changes/unreleased/ENHANCEMENTS-20250207-164803.yaml b/.changes/dev/ENHANCEMENTS-20250207-164803.yaml
similarity index 100%
rename from .changes/unreleased/ENHANCEMENTS-20250207-164803.yaml
rename to .changes/dev/ENHANCEMENTS-20250207-164803.yaml
diff --git a/.changes/unreleased/UPGRADE NOTES-20250212-36478.yaml b/.changes/dev/UPGRADE NOTES-20250212-36478.yaml
similarity index 100%
rename from .changes/unreleased/UPGRADE NOTES-20250212-36478.yaml
rename to .changes/dev/UPGRADE NOTES-20250212-36478.yaml
diff --git a/.changie.yaml b/.changie.yaml
index 098dc6fbae..6bb03d6742 100644
--- a/.changie.yaml
+++ b/.changie.yaml
@@ -1,9 +1,8 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-
 changesDir: .changes
-unreleasedDir: unreleased
+unreleasedDir: dev
 versionFooterPath: version_footer.tpl.md
 changelogPath: CHANGELOG.md
 versionExt: md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b07f9ec237..30d293140c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,27 @@
 ## 1.12.0 (Unreleased)
 
 
+
+ENHANCEMENTS:
+
+* Terraform Test command now accepts a -parallelism=n option, which sets the number of parallel operations in a test run's plan/apply operation. ([#34237](https://github.com/hashicorp/terraform/issues/34237))
+
+* Logical binary operators can now short-circuit ([#36224](https://github.com/hashicorp/terraform/issues/36224))
+
+* Terraform Test: Runs can now be annotated for possible parallel execution. ([#34180](https://github.com/hashicorp/terraform/issues/34180))
+
+* Allow terraform init when tests are present but no configuration files are directly inside the current directory ([#35040](https://github.com/hashicorp/terraform/issues/35040))
+
+* Terraform Test: Continue subsequent test execution when an expected failure is not encountered. ([#34969](https://github.com/hashicorp/terraform/issues/34969))
+
+
+BUG FIXES:
+
+* Refreshed state was not used in the plan for orphaned resource instances ([#36394](https://github.com/hashicorp/terraform/issues/36394))
+
+* Fixes malformed Terraform version error when the remote backend reads a remote workspace that specifies a Terraform version constraint. ([#36356](https://github.com/hashicorp/terraform/issues/36356))
+
+
 EXPERIMENTS:
 
 Experiments are only enabled in alpha releases of Terraform CLI. The following features are not yet available in stable releases.