diff --git a/tests/Content/images/上田雅美.jpg b/tests/Content/images/上田雅美.jpg
new file mode 100644
index 00000000..04ed9859
Binary files /dev/null and b/tests/Content/images/上田雅美.jpg differ
diff --git a/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj b/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
index e635123a..86f88c15 100644
--- a/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
+++ b/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
@@ -120,72 +120,12 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\Content\fonts\content-font.ttf">
-      <Link>fonts\content-font.ttf</Link>
+    <Content Include="..\Content\fonts\*">
+      <Link>fonts\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\Content\fonts\Distortable.ttf">
-      <Link>fonts\Distortable.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\Em.ttf">
-      <Link>fonts\Em.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\Funkster.ttf">
-      <Link>fonts\Funkster.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\HangingS.ttf">
-      <Link>fonts\HangingS.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\ReallyBigA.ttf">
-      <Link>fonts\ReallyBigA.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\Roboto2-Regular_NoEmbed.ttf">
-      <Link>fonts\Roboto2-Regular_NoEmbed.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\SpiderSymbol.ttf">
-      <Link>fonts\SpiderSymbol.ttf</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\fonts\test.ttc">
-      <Link>fonts\test.ttc</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\baboon.jpg">
-      <Link>images\baboon.jpg</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\baboon.png">
-      <Link>images\baboon.png</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\color-wheel.png">
-      <Link>images\color-wheel.png</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\index8.png">
-      <Link>images\index8.png</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\logos.svg">
-      <Link>images\logos.svg</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\animated-heart.gif">
-      <Link>images\animated-heart.gif</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\CMYK.jpg">
-      <Link>images\CMYK.jpg</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Content\images\map.png">
-      <Link>images\map.png</Link>
+    <Content Include="..\Content\images\*">
+      <Link>images\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/tests/Tests/SKStreamTest.cs b/tests/Tests/SKStreamTest.cs
new file mode 100644
index 00000000..042879b2
--- /dev/null
+++ b/tests/Tests/SKStreamTest.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Xunit;
+
+namespace SkiaSharp.Tests
+{
+	public class SKStreamTest : SKTest
+	{
+		[SkippableFact(Skip = "Windows does not support non-ASCII characters: https://github.com/mono/SkiaSharp/issues/390")]
+		public void SpecialCharactersPath()
+		{
+			var stream = new SKFileStream(@"C:\Projects\SkiaSharp\tests\Content\images\上田jj雅美.jpg");
+			Assert.NotNull(stream);
+			Assert.True(stream.Length > 0);
+		}
+	}
+}