diff --git a/src/Libraries/NRefactory/Test/Lexer/CSharp/LexerPositionTests.cs b/src/Libraries/NRefactory/Test/Lexer/CSharp/LexerPositionTests.cs
new file mode 100644
index 0000000000..8893190fa4
--- /dev/null
+++ b/src/Libraries/NRefactory/Test/Lexer/CSharp/LexerPositionTests.cs
@@ -0,0 +1,34 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
+//     <license see="prj:///doc/license.txt">GNU General Public License</license>
+//     <owner name="none" email=""/>
+//     <version>$Revision: 230 $</version>
+// </file>
+
+using System;
+using System.Drawing;
+using System.IO;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.Parser;
+using ICSharpCode.NRefactory.Parser.CSharp;
+using ICSharpCode.NRefactory.PrettyPrinter;
+
+namespace ICSharpCode.NRefactory.Tests.Lexer.CSharp
+{
+	[TestFixture]
+	public class LexerPositionTests
+	{
+		ILexer GenerateLexer(string s)
+		{
+			return ParserFactory.CreateLexer(SupportedLanguages.CSharp, new StringReader(s));
+		}
+		
+		[Test]
+		public void Test1()
+		{
+			ILexer l = GenerateLexer("public");
+			Token t = l.NextToken();
+			Assert.AreEqual(t.Location, new Point(1, 1));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj
index 8957460053..d408f1890e 100644
--- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj
+++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj
@@ -132,6 +132,7 @@
     <Compile Include="Parser\Expressions\TypeReferenceExpressionTests.cs" />
     <Compile Include="Parser\Expressions\GlobalReferenceExpressionTests.cs" />
     <Compile Include="Parser\TypeLevel\CustomEventTests.cs" />
+    <Compile Include="Lexer\CSharp\LexerPositionTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Project\NRefactory.csproj">
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index 269b40b834..f2eaa684e6 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.226
+# SharpDevelop 2.0.0.9999
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -52,6 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
@@ -183,6 +185,7 @@ Global
 		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}