diff --git a/Source/Examples/OpenTK.Examples.csproj b/Source/Examples/OpenTK.Examples.csproj
index 3ba0059f..3c9f126d 100644
--- a/Source/Examples/OpenTK.Examples.csproj
+++ b/Source/Examples/OpenTK.Examples.csproj
@@ -146,7 +146,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OpenGL\1.x\TextRendering.cs" />
-    <Compile Include="OpenGL\4.x\ShaderSourceWithJapaneseCommentTest.cs" />
+    <Compile Include="OpenTK\Test\TestShaderUtf8Support.cs" />
     <Compile Include="SamplesTreeViewSorter.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Source/Examples/OpenGL/4.x/ShaderSourceWithJapaneseCommentTest.cs b/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs
similarity index 95%
rename from Source/Examples/OpenGL/4.x/ShaderSourceWithJapaneseCommentTest.cs
rename to Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs
index abf5f5e9..0de01d45 100644
--- a/Source/Examples/OpenGL/4.x/ShaderSourceWithJapaneseCommentTest.cs
+++ b/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs
@@ -12,8 +12,8 @@ using OpenTK.Graphics.OpenGL;
 
 namespace Examples.Tutorial
 {
-    [Example("Shader Source With Japanese Comment Test", ExampleCategory.OpenGL, "4.x")]
-    public class ShaderSourceWithJapaneseCommentTest : GameWindow
+    [Example("Shader UTF8 support", ExampleCategory.OpenTK, "OpenGL")]
+    public class TestShaderUtf8Support : GameWindow
     {
         string vertexShaderSource = @"
 #version 130
@@ -91,10 +91,10 @@ void main(void)
 
         Matrix4 projectionMatrix, modelviewMatrix;
 
-        public ShaderSourceWithJapaneseCommentTest()
+        public TestShaderUtf8Support()
             : base(640, 480,
             new GraphicsMode(), "OpenGL 3 Example", 0,
-            DisplayDevice.Default, 4, 2,
+            DisplayDevice.Default, 3, 0,
             GraphicsContextFlags.ForwardCompatible | GraphicsContextFlags.Debug)
         { }
         
@@ -227,7 +227,7 @@ void main(void)
         [STAThread]
         public static void Main()
         {
-            using (ShaderSourceWithJapaneseCommentTest example = new ShaderSourceWithJapaneseCommentTest())
+            using (TestShaderUtf8Support example = new TestShaderUtf8Support())
             {
                 Utilities.SetWindowTitle(example);
                 example.Run(30);