diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
index e8db13cb62..ce1df02fcb 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
@@ -13,23 +13,20 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test, Ignore("regular goto statement is broken")]
 		public void GotoStatementTest()
 		{
-			GotoStatement gotoStmt = ParseUtilCSharp.ParseStatement<GotoStatement>("goto myLabel;");
-			Assert.AreEqual(GotoType.Label, gotoStmt.GotoType);
+			var gotoStmt = ParseUtilCSharp.ParseStatement<GotoStatement>("goto myLabel;");
 			Assert.AreEqual("myLabel", gotoStmt.Label);
 		}
 		
 		[Test]
 		public void GotoDefaultStatementTest()
 		{
-			GotoStatement gotoCaseStmt = ParseUtilCSharp.ParseStatement<GotoStatement>("goto default;");
-			Assert.AreEqual(GotoType.CaseDefault, gotoCaseStmt.GotoType);
+			var gotoCaseStmt = ParseUtilCSharp.ParseStatement<GotoDefaultStatement>("goto default;");
 		}
 		
 		[Test]
 		public void GotoCaseStatementTest()
 		{
-			GotoStatement gotoCaseStmt = ParseUtilCSharp.ParseStatement<GotoStatement>("goto case 6;");
-			Assert.AreEqual(GotoType.Case, gotoCaseStmt.GotoType);
+			var gotoCaseStmt = ParseUtilCSharp.ParseStatement<GotoCaseStatement>("goto case 6;");
 			Assert.IsTrue(gotoCaseStmt.LabelExpression is PrimitiveExpression);
 		}
 		
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/WhileStatementTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/WhileStatementTests.cs
index 6ad09465da..689eb05845 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/WhileStatementTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/WhileStatementTests.cs
@@ -13,7 +13,6 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		public void WhileStatementTest()
 		{
 			WhileStatement loopStmt = ParseUtilCSharp.ParseStatement<WhileStatement>("while (true) { }");
-			Assert.AreEqual(WhilePosition.Begin, loopStmt.WhilePosition);
 			Assert.IsTrue(loopStmt.Condition is PrimitiveExpression);
 			Assert.IsTrue(loopStmt.EmbeddedStatement is BlockStatement);
 		}
@@ -21,8 +20,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test]
 		public void DoWhileStatementTest()
 		{
-			WhileStatement loopStmt = ParseUtilCSharp.ParseStatement<WhileStatement>("do { } while (true);");
-			Assert.AreEqual(WhilePosition.End, loopStmt.WhilePosition);
+			DoWhileStatement loopStmt = ParseUtilCSharp.ParseStatement<DoWhileStatement>("do { } while (true);");
 			Assert.IsTrue(loopStmt.Condition is PrimitiveExpression);
 			Assert.IsTrue(loopStmt.EmbeddedStatement is BlockStatement);
 		}