diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
new file mode 100644
index 0000000000..f40ba3cee0
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls.Presenters;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Presenters
+{
+    public class TextPresenter_Tests
+    {
+        [Fact]
+        public void TextPresenter_can_contain_null_with_password_char_set()
+        {
+            var target = new TextPresenter
+            {
+                PasswordChar = '*'
+            };
+
+            Assert.NotNull(target.FormattedText);
+        }
+
+        [Fact]
+        public void TextPresenter_can_contain_null_without_password_char_set()
+        {
+            var target = new TextPresenter();
+
+            Assert.NotNull(target.FormattedText);
+        }
+    }
+}