diff --git a/src/AddIns/Misc/UnitTesting/Test/NUnitConsoleExeSelectedTestFixture.cs b/src/AddIns/Misc/UnitTesting/Test/NUnitConsoleExeSelectedTestFixture.cs
index 126a065243..ab7ae27262 100644
--- a/src/AddIns/Misc/UnitTesting/Test/NUnitConsoleExeSelectedTestFixture.cs
+++ b/src/AddIns/Misc/UnitTesting/Test/NUnitConsoleExeSelectedTestFixture.cs
@@ -42,10 +42,24 @@ namespace UnitTesting.Tests
 			MockCSharpProject project = new MockCSharpProject();
 			UnitTestApplicationStartHelper helper = new UnitTestApplicationStartHelper();
 			helper.Initialize(project, null);
-			Assert.AreEqual(@"D:\SharpDevelop\bin\Tools\NUnit\nunit-console-dotnet2.exe", helper.UnitTestApplication);
+			Assert.AreEqual(@"D:\SharpDevelop\bin\Tools\NUnit\nunit-console-dotnet2-x86.exe", helper.UnitTestApplication);
 		}
 		
 		
+		[Test]
+		public void TargetCpuAnyCPUDotnet2()
+		{
+			MockCSharpProject project = new MockCSharpProject();
+			project.ActiveConfiguration = "Debug";
+			project.ActivePlatform = "AnyCPU";
+			project.SetProperty("PlatformTarget", "AnyCPU");
+			project.SetProperty("TargetFrameworkVersion", "v3.5");
+			
+			UnitTestApplicationStartHelper helper = new UnitTestApplicationStartHelper();
+			helper.Initialize(project, null);
+			Assert.AreEqual(@"D:\SharpDevelop\bin\Tools\NUnit\nunit-console-dotnet2.exe", helper.UnitTestApplication);
+		}
+		
 		[Test]
 		public void NUnitConsole32BitUsedWhenTargetCpuIs32BitDotnet2()
 		{
diff --git a/src/AddIns/Misc/UnitTesting/Test/UnitTestCommandLineTests.cs b/src/AddIns/Misc/UnitTesting/Test/UnitTestCommandLineTests.cs
index 6d557af1e2..a5eb622657 100644
--- a/src/AddIns/Misc/UnitTesting/Test/UnitTestCommandLineTests.cs
+++ b/src/AddIns/Misc/UnitTesting/Test/UnitTestCommandLineTests.cs
@@ -184,7 +184,7 @@ namespace UnitTesting.Tests
 			
 			FileUtility.ApplicationRootPath = @"C:\SharpDevelop";
 			
-			string expectedFullCommandLine = "\"C:\\SharpDevelop\\bin\\Tools\\NUnit\\nunit-console.exe\" \"C:\\Projects\\MyTests\\MyTests.dll\" /nologo";
+			string expectedFullCommandLine = "\"C:\\SharpDevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" \"C:\\Projects\\MyTests\\MyTests.dll\" /nologo";
 			Assert.AreEqual(expectedFullCommandLine, helper.GetCommandLine());
 		}