diff --git a/internal/fwschemadata/value_semantic_equality_set_test.go b/internal/fwschemadata/value_semantic_equality_set_test.go
index 59b34856b..d5fa25c85 100644
--- a/internal/fwschemadata/value_semantic_equality_set_test.go
+++ b/internal/fwschemadata/value_semantic_equality_set_test.go
@@ -50,6 +50,34 @@ func TestValueSemanticEqualitySet(t *testing.T) {
 				),
 			},
 		},
+		"SetValue-diff-order": {
+			request: fwschemadata.ValueSemanticEqualityRequest{
+				Path: path.Root("test"),
+				PriorValue: types.SetValueMust(
+					types.StringType,
+					[]attr.Value{
+						types.StringValue("prior"),
+						types.StringValue("value"),
+					},
+				),
+				ProposedNewValue: types.SetValueMust(
+					types.StringType,
+					[]attr.Value{
+						types.StringValue("value"),
+						types.StringValue("new"),
+					},
+				),
+			},
+			expected: &fwschemadata.ValueSemanticEqualityResponse{
+				NewValue: types.SetValueMust(
+					types.StringType,
+					[]attr.Value{
+						types.StringValue("value"),
+						types.StringValue("new"),
+					},
+				),
+			},
+		},
 		// ElementType with semantic equality
 		"SetValue-StringValuableWithSemanticEquals-true": {
 			request: fwschemadata.ValueSemanticEqualityRequest{
@@ -91,6 +119,64 @@ func TestValueSemanticEqualitySet(t *testing.T) {
 				),
 			},
 		},
+		"SetValue-StringValuableWithSemanticEquals-true-diff-order": {
+			request: fwschemadata.ValueSemanticEqualityRequest{
+				Path: path.Root("test"),
+				PriorValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("keep-lowercase-123"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+							},
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("keep-lowercase-456"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+							},
+						},
+					},
+				),
+				ProposedNewValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("keep-lowercase-456"),
+							},
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("keep-lowercase-123"),
+							},
+						},
+					},
+				),
+			},
+			expected: &fwschemadata.ValueSemanticEqualityResponse{
+				NewValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("keep-lowercase-123"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+							},
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue: types.StringValue("keep-lowercase-456"),
+							SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+								StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+							},
+						},
+					},
+				),
+			},
+		},
 		"SetValue-StringValuableWithSemanticEquals-false": {
 			request: fwschemadata.ValueSemanticEqualityRequest{
 				Path: path.Root("test"),
@@ -131,6 +217,58 @@ func TestValueSemanticEqualitySet(t *testing.T) {
 				),
 			},
 		},
+		"SetValue-StringValuableWithSemanticEquals-false-diff-order": {
+			request: fwschemadata.ValueSemanticEqualityRequest{
+				Path: path.Root("test"),
+				PriorValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{
+						SemanticEquals: false,
+					},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("prior"),
+							SemanticEquals: false,
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("value"),
+							SemanticEquals: false,
+						},
+					},
+				),
+				ProposedNewValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{
+						SemanticEquals: false,
+					},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("value"),
+							SemanticEquals: false,
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("new"),
+							SemanticEquals: false,
+						},
+					},
+				),
+			},
+			expected: &fwschemadata.ValueSemanticEqualityResponse{
+				NewValue: types.SetValueMust(
+					testtypes.StringTypeWithSemanticEquals{
+						SemanticEquals: false,
+					},
+					[]attr.Value{
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("value"),
+							SemanticEquals: false,
+						},
+						testtypes.StringValueWithSemanticEquals{
+							StringValue:    types.StringValue("new"),
+							SemanticEquals: false,
+						},
+					},
+				),
+			},
+		},
 		"SetValue-StringValuableWithSemanticEquals-diagnostics": {
 			request: fwschemadata.ValueSemanticEqualityRequest{
 				Path: path.Root("test"),
@@ -267,6 +405,136 @@ func TestValueSemanticEqualitySet(t *testing.T) {
 				),
 			},
 		},
+		"SetValue-SetValue-StringValuableWithSemanticEquals-true-diff-order": {
+			request: fwschemadata.ValueSemanticEqualityRequest{
+				Path: path.Root("test"),
+				PriorValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-123"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-456"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+									},
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-789"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-789"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-012"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-012"),
+									},
+								},
+							},
+						),
+					},
+				),
+				ProposedNewValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("KEEP-LOWERCASE-012"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("keep-lowercase-012"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("KEEP-LOWERCASE-789"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("keep-lowercase-789"),
+									},
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("keep-lowercase-456"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("keep-lowercase-123"),
+									},
+								},
+							},
+						),
+					},
+				),
+			},
+			expected: &fwschemadata.ValueSemanticEqualityResponse{
+				NewValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-123"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-123"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-456"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-456"),
+									},
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-789"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-789"),
+									},
+								},
+								testtypes.StringValueWithSemanticEquals{
+									StringValue: types.StringValue("keep-lowercase-012"),
+									SemanticallyEqualTo: testtypes.StringValueWithSemanticEquals{
+										StringValue: types.StringValue("KEEP-LOWERCASE-012"),
+									},
+								},
+							},
+						),
+					},
+				),
+			},
+		},
 		"SetValue-SetValue-StringValuableWithSemanticEquals-false": {
 			request: fwschemadata.ValueSemanticEqualityRequest{
 				Path: path.Root("test"),
@@ -334,6 +602,106 @@ func TestValueSemanticEqualitySet(t *testing.T) {
 				),
 			},
 		},
+		"SetValue-SetValue-StringValuableWithSemanticEquals-false-diff-order": {
+			request: fwschemadata.ValueSemanticEqualityRequest{
+				Path: path.Root("test"),
+				PriorValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{
+							SemanticEquals: false,
+						},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("prior"),
+									SemanticEquals: false,
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("value"),
+									SemanticEquals: false,
+								},
+							},
+						),
+					},
+				),
+				ProposedNewValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{
+							SemanticEquals: false,
+						},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("value"),
+									SemanticEquals: false,
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("new"),
+									SemanticEquals: false,
+								},
+							},
+						),
+					},
+				),
+			},
+			expected: &fwschemadata.ValueSemanticEqualityResponse{
+				NewValue: types.SetValueMust(
+					types.SetType{
+						ElemType: testtypes.StringTypeWithSemanticEquals{
+							SemanticEquals: false,
+						},
+					},
+					[]attr.Value{
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("value"),
+									SemanticEquals: false,
+								},
+							},
+						),
+						types.SetValueMust(
+							testtypes.StringTypeWithSemanticEquals{
+								SemanticEquals: false,
+							},
+							[]attr.Value{
+								testtypes.StringValueWithSemanticEquals{
+									StringValue:    types.StringValue("new"),
+									SemanticEquals: false,
+								},
+							},
+						),
+					},
+				),
+			},
+		},
 		"SetValue-SetValue-StringValuableWithSemanticEquals-NewValueElementsGreaterThanPriorValueElements": {
 			request: fwschemadata.ValueSemanticEqualityRequest{
 				Path: path.Root("test"),
diff --git a/internal/testing/testtypes/stringwithsemanticequals.go b/internal/testing/testtypes/stringwithsemanticequals.go
index 4baf39d4c..a317f3dd3 100644
--- a/internal/testing/testtypes/stringwithsemanticequals.go
+++ b/internal/testing/testtypes/stringwithsemanticequals.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
@@ -24,7 +25,12 @@ var (
 type StringTypeWithSemanticEquals struct {
 	basetypes.StringType
 
-	SemanticEquals            bool
+	// Will always return true for semantic equality
+	SemanticEquals bool
+
+	// Will only return semantic equality as true if the string matches this
+	SemanticallyEqualTo types.String
+
 	SemanticEqualsDiagnostics diag.Diagnostics
 }
 
@@ -52,6 +58,7 @@ func (t StringTypeWithSemanticEquals) ValueFromString(ctx context.Context, in ba
 	value := StringValueWithSemanticEquals{
 		StringValue:               in,
 		SemanticEquals:            t.SemanticEquals,
+		SemanticallyEqualTo:       t.SemanticallyEqualTo,
 		SemanticEqualsDiagnostics: t.SemanticEqualsDiagnostics,
 	}
 
@@ -83,6 +90,7 @@ func (t StringTypeWithSemanticEquals) ValueFromTerraform(ctx context.Context, in
 func (t StringTypeWithSemanticEquals) ValueType(ctx context.Context) attr.Value {
 	return StringValueWithSemanticEquals{
 		SemanticEquals:            t.SemanticEquals,
+		SemanticallyEqualTo:       t.SemanticallyEqualTo,
 		SemanticEqualsDiagnostics: t.SemanticEqualsDiagnostics,
 	}
 }
@@ -90,7 +98,12 @@ func (t StringTypeWithSemanticEquals) ValueType(ctx context.Context) attr.Value
 type StringValueWithSemanticEquals struct {
 	basetypes.StringValue
 
-	SemanticEquals            bool
+	// Will always return true for semantic equality
+	SemanticEquals bool
+
+	// Will only return semantic equality as true if the string matches this
+	SemanticallyEqualTo attr.Value
+
 	SemanticEqualsDiagnostics diag.Diagnostics
 }
 
@@ -105,6 +118,9 @@ func (v StringValueWithSemanticEquals) Equal(o attr.Value) bool {
 }
 
 func (v StringValueWithSemanticEquals) StringSemanticEquals(ctx context.Context, otherV basetypes.StringValuable) (bool, diag.Diagnostics) {
+	if v.SemanticallyEqualTo != nil {
+		return v.SemanticallyEqualTo.Equal(otherV), v.SemanticEqualsDiagnostics
+	}
 	return v.SemanticEquals, v.SemanticEqualsDiagnostics
 }