diff --git a/Dockerfile b/Dockerfile
index 0adc7db25..c3a286cbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG DEBIAN_TAG=12.5-slim@sha256:804194b909ef23fb995d9412c9378fb3505fe2427b70f3cc
 ARG GOLANG_TAG=1.22.4-alpine@sha256:9bdd5692d39acc3f8d0ea6f81327f87ac6b473dd29a2b6006df362bff48dd1f8
 
 # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
-ARG DEFAULT_TERRAFORM_VERSION=1.8.4
+ARG DEFAULT_TERRAFORM_VERSION=1.8.5
 # renovate: datasource=github-releases depName=opentofu/opentofu versioning=hashicorp
 ARG DEFAULT_OPENTOFU_VERSION=1.7.2
 # renovate: datasource=github-releases depName=open-policy-agent/conftest
diff --git a/server/controllers/events/testdata/null_provider_lockfile_old_version b/server/controllers/events/testdata/null_provider_lockfile_old_version
index 9af6a64b2..c83acaa26 100644
--- a/server/controllers/events/testdata/null_provider_lockfile_old_version
+++ b/server/controllers/events/testdata/null_provider_lockfile_old_version
@@ -2,20 +2,24 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/null" {
-  version     = "3.1.0"
-  constraints = "3.1.0"
+  version     = "3.2.2"
+  constraints = "3.2.2"
   hashes = [
-    "h1:grYDj8/Lvp1OwME+g1AsECPN1czO5ssSf+8fCluCHQY=",
-    "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2",
-    "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515",
-    "zh:5f9200bf708913621d0f6514179d89700e9aa3097c77dac730e8ba6e5901d521",
-    "zh:9ebf4d9704faba06b3ec7242c773c0fbfe12d62db7d00356d4f55385fc69bfb2",
-    "zh:a6576c81adc70326e4e1c999c04ad9ca37113a6e925aefab4765e5a5198efa7e",
-    "zh:a8a42d13346347aff6c63a37cda9b2c6aa5cc384a55b2fe6d6adfa390e609c53",
-    "zh:c797744d08a5307d50210e0454f91ca4d1c7621c68740441cf4579390452321d",
-    "zh:cecb6a304046df34c11229f20a80b24b1603960b794d68361a67c5efe58e62b8",
-    "zh:e1371aa1e502000d9974cfaff5be4cfa02f47b17400005a16f14d2ef30dc2a70",
-    "zh:fc39cc1fe71234a0b0369d5c5c7f876c71b956d23d7d6f518289737a001ba69b",
-    "zh:fea4227271ebf7d9e2b61b89ce2328c7262acd9fd190e1fd6d15a591abfa848e",
+    "h1:Gef5VGfobY5uokA5nV/zFvWeMNR2Pmq79DH94QnNZPM=",
+    "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=",
+    "h1:vWAsYRd7MjYr3adj8BVKRohVfHpWQdvkIwUQ2Jf5FVM=",
+    "h1:zT1ZbegaAYHwQa+QwIFugArWikRJI9dqohj8xb0GY88=",
+    "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7",
+    "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a",
+    "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3",
+    "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606",
+    "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546",
+    "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539",
+    "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422",
+    "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae",
+    "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1",
+    "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e",
   ]
 }
diff --git a/server/controllers/events/testdata/test-repos/automerge/dir1/versions.tf b/server/controllers/events/testdata/test-repos/automerge/dir1/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/automerge/dir1/versions.tf
+++ b/server/controllers/events/testdata/test-repos/automerge/dir1/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/automerge/dir2/versions.tf b/server/controllers/events/testdata/test-repos/automerge/dir2/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/automerge/dir2/versions.tf
+++ b/server/controllers/events/testdata/test-repos/automerge/dir2/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/modules-yaml/modules/null/versions.tf b/server/controllers/events/testdata/test-repos/modules-yaml/modules/null/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/modules-yaml/modules/null/versions.tf
+++ b/server/controllers/events/testdata/test-repos/modules-yaml/modules/null/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/modules/modules/null/versions.tf b/server/controllers/events/testdata/test-repos/modules/modules/null/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/modules/modules/null/versions.tf
+++ b/server/controllers/events/testdata/test-repos/modules/modules/null/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir1/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir1/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir1/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir1/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir2/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir2/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir2/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/dir2/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/policy-checks/versions.tf b/server/controllers/events/testdata/test-repos/policy-checks/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/policy-checks/versions.tf
+++ b/server/controllers/events/testdata/test-repos/policy-checks/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/production/versions.tf b/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/production/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/production/versions.tf
+++ b/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/production/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/staging/versions.tf b/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/staging/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/staging/versions.tf
+++ b/server/controllers/events/testdata/test-repos/repo-config-file/infrastructure/staging/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/server-side-cfg/versions.tf b/server/controllers/events/testdata/test-repos/server-side-cfg/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/server-side-cfg/versions.tf
+++ b/server/controllers/events/testdata/test-repos/server-side-cfg/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/simple-with-lockfile/versions.tf b/server/controllers/events/testdata/test-repos/simple-with-lockfile/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/simple-with-lockfile/versions.tf
+++ b/server/controllers/events/testdata/test-repos/simple-with-lockfile/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/simple-yaml/versions.tf b/server/controllers/events/testdata/test-repos/simple-yaml/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/simple-yaml/versions.tf
+++ b/server/controllers/events/testdata/test-repos/simple-yaml/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/simple/versions.tf b/server/controllers/events/testdata/test-repos/simple/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/simple/versions.tf
+++ b/server/controllers/events/testdata/test-repos/simple/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/versions.tf b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/versions.tf
+++ b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/tfvars-yaml/versions.tf b/server/controllers/events/testdata/test-repos/tfvars-yaml/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/tfvars-yaml/versions.tf
+++ b/server/controllers/events/testdata/test-repos/tfvars-yaml/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/production/versions.tf b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/production/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/production/versions.tf
+++ b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/production/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/staging/versions.tf b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/staging/versions.tf
index 003111ee8..96a68f805 100644
--- a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/staging/versions.tf
+++ b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/staging/versions.tf
@@ -1,4 +1,3 @@
-provider "null" {}
 terraform {
   required_providers {
     null = {
diff --git a/testdrive/utils.go b/testdrive/utils.go
index 6263e31ad..b29dc5ad3 100644
--- a/testdrive/utils.go
+++ b/testdrive/utils.go
@@ -35,7 +35,7 @@ import (
 )
 
 const hashicorpReleasesURL = "https://releases.hashicorp.com"
-const terraformVersion = "1.8.4" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
+const terraformVersion = "1.8.5" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
 const ngrokDownloadURL = "https://bin.equinox.io/c/4VmDzA7iaHb"
 const ngrokAPIURL = "localhost:41414" // We hope this isn't used.
 const atlantisPort = 4141
diff --git a/testing/Dockerfile b/testing/Dockerfile
index 6235163d0..a5969a0d4 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install unzip \
 
 # Install Terraform
 # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
-ENV TERRAFORM_VERSION=1.8.4
+ENV TERRAFORM_VERSION=1.8.5
 RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \
     wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_${ARCH}.zip && \
     mkdir -p /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \