diff --git a/docs/ApprovalTests/EnvironmentSpecificTests.md b/docs/ApprovalTests/EnvironmentSpecificTests.md
index 089bb549..a7db9a42 100644
--- a/docs/ApprovalTests/EnvironmentSpecificTests.md
+++ b/docs/ApprovalTests/EnvironmentSpecificTests.md
@@ -63,11 +63,12 @@ Like EmailTest.Testname.Microsoft_Windows_10_Education.approved.eml
EmailTest.Testname.Microsoft_Windows_10_Enterprise.approved.eml
EmailTest.Testname.Microsoft_Windows_10_Home_N.approved.eml
EmailTest.Testname.Microsoft_Windows_10_Pro.approved.eml
+EmailTest.Testname.Microsoft_Windows_11_Enterprise.approved.eml
EmailTest.Testname.Microsoft_Windows_11_Pro.approved.eml
EmailTest.Testname.Microsoft_Windows_Server_2016_Datacenter.approved.eml
EmailTest.Testname.Microsoft_Windows_Server_2019_Datacenter.approved.eml
```
-snippet source | anchor
+snippet source | anchor
If this is run on a new machine, it could produce a new approval file. This can be confusing as you might not remember what the old system used to produce.
diff --git a/src/ApprovalTests.Tests/Email/EmailTest.TestAttachment.Microsoft_Windows_11_Enterprise.approved.eml b/src/ApprovalTests.Tests/Email/EmailTest.TestAttachment.Microsoft_Windows_11_Enterprise.approved.eml
new file mode 100644
index 00000000..74fc814a
--- /dev/null
+++ b/src/ApprovalTests.Tests/Email/EmailTest.TestAttachment.Microsoft_Windows_11_Enterprise.approved.eml
@@ -0,0 +1,107 @@
+X-Sender: everybody@acomputer.com
+X-Receiver: approvals@approvaltests.com
+MIME-Version: 1.0
+From: everybody@acomputer.com
+To: approvals@approvaltests.com
+Subject: this project rocks
+Content-Type: multipart/mixed;
+ boundary=--boundary_1_--boundary_0_00000000-0000-0000-0000-000000000000
+
+
+----boundary_1_--boundary_0_00000000-0000-0000-0000-000000000000
+Content-Type: multipart/alternative;
+ boundary=--boundary_0_--boundary_1_00000000-0000-0000-0000-000000000001
+
+
+----boundary_0_--boundary_1_00000000-0000-0000-0000-000000000001
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+Pictures Attached
+----boundary_0_--boundary_1_00000000-0000-0000-0000-000000000001
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+This be alternate.
+----boundary_0_--boundary_1_00000000-0000-0000-0000-000000000001--
+
+----boundary_1_--boundary_0_00000000-0000-0000-0000-000000000000
+Content-Type: multipart/mixed;
+ boundary=--boundary_2_--boundary_2_00000000-0000-0000-0000-000000000002
+
+
+----boundary_2_--boundary_2_00000000-0000-0000-0000-000000000002
+Content-Type: application/octet-stream; name=tower.png
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment
+
+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
+----boundary_2_--boundary_2_00000000-0000-0000-0000-000000000002--
+
+----boundary_1_--boundary_0_00000000-0000-0000-0000-000000000000--
diff --git a/src/ApprovalTests.Tests/Email/EmailTest.Testname.Microsoft_Windows_11_Enterprise.approved.eml b/src/ApprovalTests.Tests/Email/EmailTest.Testname.Microsoft_Windows_11_Enterprise.approved.eml
new file mode 100644
index 00000000..ebacc886
--- /dev/null
+++ b/src/ApprovalTests.Tests/Email/EmailTest.Testname.Microsoft_Windows_11_Enterprise.approved.eml
@@ -0,0 +1,11 @@
+X-Sender: everybody@acomputer.com
+X-Receiver: approvals@approvaltests.com
+MIME-Version: 1.0
+From: everybody@acomputer.com
+To: approvals@approvaltests.com
+Subject: this project rocks
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+Wow, this is so cool.=0D=0AI should send more emails.=0D=0Athanks=
+,=0D=0Ayour biggest fan
\ No newline at end of file
diff --git a/src/ApprovalTests.Tests/Namer/ApprovalsFilenameTest.TestSimilarFiles.approved.txt b/src/ApprovalTests.Tests/Namer/ApprovalsFilenameTest.TestSimilarFiles.approved.txt
index 07bb35d2..14e0ca11 100644
--- a/src/ApprovalTests.Tests/Namer/ApprovalsFilenameTest.TestSimilarFiles.approved.txt
+++ b/src/ApprovalTests.Tests/Namer/ApprovalsFilenameTest.TestSimilarFiles.approved.txt
@@ -3,6 +3,7 @@
EmailTest.Testname.Microsoft_Windows_10_Enterprise.approved.eml
EmailTest.Testname.Microsoft_Windows_10_Home_N.approved.eml
EmailTest.Testname.Microsoft_Windows_10_Pro.approved.eml
+EmailTest.Testname.Microsoft_Windows_11_Enterprise.approved.eml
EmailTest.Testname.Microsoft_Windows_11_Pro.approved.eml
EmailTest.Testname.Microsoft_Windows_Server_2016_Datacenter.approved.eml
EmailTest.Testname.Microsoft_Windows_Server_2019_Datacenter.approved.eml