diff --git a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
index 36161916db..5fa06efc2b 100644
--- a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
+++ b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
@@ -144,9 +144,9 @@
     <Compile Include="ProcessExitedTestFixture.cs" />
     <Compile Include="ProcessRunnerNotStartedTestFixture.cs" />
     <Compile Include="ConsoleAppTestFixtureBase.cs" />
-    <Compile Include="Services_Navigation\INavigationPointTextFixture.cs" />
-    <Compile Include="Services_Navigation\TestNavigationPoint.cs" />
-    <Compile Include="Services_Navigation\NavigationServiceTestFixture.cs" />
+    <Compile Include="NavigationServiceTests\INavigationPointTextFixture.cs" />
+    <Compile Include="NavigationServiceTests\TestNavigationPoint.cs" />
+    <Compile Include="NavigationServiceTests\NavigationServiceTestFixture.cs" />
     <Compile Include="SharpDevelopColorDialogTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -177,7 +177,7 @@
     <Folder Include="Utils\Tests" />
     <Folder Include="WebReferences" />
     <Folder Include="Templates" />
-    <Folder Include="Services_Navigation" />
+    <Folder Include="NavigationServiceTests" />
     <ProjectReference Include="..\..\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
       <Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
diff --git a/src/Main/Base/Test/Services_Navigation/INavigationPointTextFixture.cs b/src/Main/Base/Test/NavigationServiceTests/INavigationPointTextFixture.cs
similarity index 97%
rename from src/Main/Base/Test/Services_Navigation/INavigationPointTextFixture.cs
rename to src/Main/Base/Test/NavigationServiceTests/INavigationPointTextFixture.cs
index 5444a49d6a..59c5f5a7a7 100644
--- a/src/Main/Base/Test/Services_Navigation/INavigationPointTextFixture.cs
+++ b/src/Main/Base/Test/NavigationServiceTests/INavigationPointTextFixture.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 
-namespace NavigationServiceTests
+namespace ICSharpCode.SharpDevelop.Tests.NavigationServiceTests
 {
 	[TestFixture]
 	public class INavigationPointTextFixture
diff --git a/src/Main/Base/Test/Services_Navigation/NavigationServiceTestFixture.cs b/src/Main/Base/Test/NavigationServiceTests/NavigationServiceTestFixture.cs
similarity index 99%
rename from src/Main/Base/Test/Services_Navigation/NavigationServiceTestFixture.cs
rename to src/Main/Base/Test/NavigationServiceTests/NavigationServiceTestFixture.cs
index 9a046a4938..59a720d1ec 100644
--- a/src/Main/Base/Test/Services_Navigation/NavigationServiceTestFixture.cs
+++ b/src/Main/Base/Test/NavigationServiceTests/NavigationServiceTestFixture.cs
@@ -8,7 +8,7 @@ using NUnit.Framework;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 
-namespace NavigationServiceTests
+namespace ICSharpCode.SharpDevelop.Tests.NavigationServiceTests
 {
 	/// <summary>
 	/// Provides unit tests for the <see cref="NavigationService"/>.
diff --git a/src/Main/Base/Test/Services_Navigation/TestNavigationPoint.cs b/src/Main/Base/Test/NavigationServiceTests/TestNavigationPoint.cs
similarity index 93%
rename from src/Main/Base/Test/Services_Navigation/TestNavigationPoint.cs
rename to src/Main/Base/Test/NavigationServiceTests/TestNavigationPoint.cs
index 9ff94650e7..09620f184e 100644
--- a/src/Main/Base/Test/Services_Navigation/TestNavigationPoint.cs
+++ b/src/Main/Base/Test/NavigationServiceTests/TestNavigationPoint.cs
@@ -6,11 +6,8 @@ using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 
-namespace NavigationServiceTests
+namespace ICSharpCode.SharpDevelop.Tests.NavigationServiceTests
 {
-	/// <summary>
-	/// Description of TestNavigationPoint.
-	/// </summary>
 	public class TestNavigationPoint : DefaultNavigationPoint
 	{
 		public TestNavigationPoint(string filename) : this(filename, 0) {}