diff --git a/src/Umbraco.Tests/TeamCity.proj b/src/Umbraco.Tests/TeamCity.proj
index fd4070ae5b..0bc83a35f4 100644
--- a/src/Umbraco.Tests/TeamCity.proj
+++ b/src/Umbraco.Tests/TeamCity.proj
@@ -1,15 +1,19 @@
 <Project DefaultTargets="RunTests" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<ItemGroup>
-	  <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.2.*" />
-	</ItemGroup>
-	
-	<Target Name="RunTests">
-		<PropertyGroup>
-			<NUnitHome>$(MSBuildProjectDirectory)\..\..\tools\NUnit</NUnitHome>
-			<NUnitFileName>$(MSBuildProjectDirectory)\bin\Debug\Umbraco.Tests.dll</NUnitFileName>
-		</PropertyGroup>
 
-		<Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(NUnitHome)" />
-		<Exec Command="$(NUnitHome)\NUnit-Console.exe $(NUnitFileName)" />
+	<PropertyGroup>
+		<MSBuildCommunityTasksPath>..\..\tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+	</PropertyGroup>
+
+	<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
+
+	<Target Name="RunTests">
+
+		<ItemGroup>
+			<TestAssemblies Include=".\bin\Debug\Umbraco.Tests.dll" />
+		</ItemGroup>
+
+		<NUnit ToolPath="..\..\tools\NUnit\" Assemblies="@(TestAssemblies)" OutputXmlFile=".\NUnitTestResults.xml" />
+		
 	</Target>
+
 </Project>
\ No newline at end of file