diff --git a/srcpkgs/opentofu/patches/test-version-mismatch.patch b/srcpkgs/opentofu/patches/test-version-mismatch.patch
new file mode 100644
index 00000000000000..73d4890fe35a5f
--- /dev/null
+++ b/srcpkgs/opentofu/patches/test-version-mismatch.patch
@@ -0,0 +1,66 @@
+# Fixes failing tests due to patch version mismatch or -dev version suffix
+# Will probably have to be removed or regenerated next version
+#
+# --- FAIL: TestPrimaryChdirOption (0.08s)
+#     primary_test.go:192: failed to read plan file: plan file was created by OpenTofu or Terraform 1.12.1-dev, but this is 1.12.1; plan files cannot be transferred between different versions of OpenTofu / Terraform
+# FAIL
+# 
+# --- FAIL: TestStateViews (0.01s)
+#     --- FAIL: TestStateViews/showResourceState_with_proper_state (0.00s)
+#         state_test.go:676: unexpected output on line 0:
+#               map[string]any{
+#               	"format_version":    string("1.0"),
+#             - 	"terraform_version": string("1.12.0"),
+#             + 	"terraform_version": string("1.12.1"),
+#               	"values":            map[string]any{"root_module": map[string]any{"resources": []any{map[string]any{"address": string("test_resource.foo"), "mode": string("managed"), "name": string("foo"), "provider_name": string("registry.opentofu.org/hashicorp/test"), ...}}}},
+#               }
+#         state_test.go:700: unexpected output on line 0:
+#               map[string]any{
+#               	"format_version":    string("1.0"),
+#             - 	"terraform_version": string("1.12.0"),
+#             + 	"terraform_version": string("1.12.1"),
+#               	"values":            map[string]any{"root_module": map[string]any{"resources": []any{map[string]any{"address": string("test_resource.foo"), "mode": string("managed"), "name": string("foo"), "provider_name": string("registry.opentofu.org/hashicorp/test"), ...}}}},
+#               }
+# FAIL
+# 
+# --- FAIL: TestEphemeralWorkflowAndOutput (4.89s)
+#     --- FAIL: TestEphemeralWorkflowAndOutput/proto_version_6 (2.40s)
+#         primary_test.go:333: failed to read the plan file: plan file was created by OpenTofu or Terraform 1.12.1-dev, but this is 1.12.1; plan files cannot be transferred between different versions of OpenTofu / Terraform
+#     --- FAIL: TestEphemeralWorkflowAndOutput/proto_version_5 (2.48s)
+#         primary_test.go:333: failed to read the plan file: plan file was created by OpenTofu or Terraform 1.12.1-dev, but this is 1.12.1; plan files cannot be transferred between different versions of OpenTofu / Terraform
+# FAIL
+
+diff --git a/internal/command/views/state_test.go b/internal/command/views/state_test.go
+index 8485ccc1c5..fa541f0808 100644
+--- a/internal/command/views/state_test.go
++++ b/internal/command/views/state_test.go
+@@ -532,7 +532,7 @@ resource "test_resource" "foo" {
+ 			wantJson: []map[string]any{
+ 				{
+ 					"format_version":    "1.0",
+-					"terraform_version": "1.12.0",
++					"terraform_version": "1.12.1",
+ 					"values": map[string]any{
+ 						"root_module": map[string]any{
+ 							"resources": []any{
+diff --git a/internal/plans/planfile/tfplan.go b/internal/plans/planfile/tfplan.go
+index b6c0e1b537..6737e96ccd 100644
+--- a/internal/plans/planfile/tfplan.go
++++ b/internal/plans/planfile/tfplan.go
+@@ -8,6 +8,7 @@ package planfile
+ import (
+ 	"fmt"
+ 	"io"
++	"strings"
+ 	"time"
+ 
+ 	"github.com/zclconf/go-cty/cty"
+@@ -55,7 +56,7 @@ func readTfplan(r io.Reader) (*plans.Plan, error) {
+ 		return nil, fmt.Errorf("unsupported plan file format version %d; only version %d is supported", rawPlan.Version, tfplanFormatVersion)
+ 	}
+ 
+-	if rawPlan.TerraformVersion != version.String() {
++	if strings.TrimSuffix(rawPlan.TerraformVersion, "-dev") != strings.TrimSuffix(version.String(), "-dev") {
+ 		return nil, fmt.Errorf("plan file was created by OpenTofu or Terraform %s, but this is %s; plan files cannot be transferred between different versions of OpenTofu / Terraform", rawPlan.TerraformVersion, version.String())
+ 	}
+ 
diff --git a/srcpkgs/opentofu/template b/srcpkgs/opentofu/template
index 475be1a3d627bc..62383e34bd72f2 100644
--- a/srcpkgs/opentofu/template
+++ b/srcpkgs/opentofu/template
@@ -1,16 +1,15 @@
 # Template file for 'opentofu'
 pkgname=opentofu
-version=1.11.3
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="github.com/opentofu/$pkgname"
 go_package="${go_import_path}/cmd/tofu"
 go_ldflags="-X ${go_import_path}/version.dev=no"
-make_check_args="-skip=TestPrimaryChdirOption"
 short_desc="Tool for building and changing infrastructure, from community"
 maintainer="Emil Tomczyk <emru@emru.xyz>"
 license="MPL-2.0"
 homepage="https://opentofu.org/"
 changelog="https://github.com/opentofu/opentofu/releases"
 distfiles="https://github.com/opentofu/opentofu/archive/v$version.tar.gz"
-checksum=bb79b27e586913f301ecf57e9aaac008582cc133a30c424d6775c5253f2acbeb
+checksum=c736126cea1f0067e046ef0172eb4ba2b39bcf1494d399e067b9e63e0f0d20d6