diff --git a/rakefile.rb b/rakefile.rb
index 8f11434..8fe4106 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -8,6 +8,7 @@
 
 $config = ENV['config'] || 'Debug'
 $nuget_api_key = ENV['nuget_api_key']
+$teamcity = (not ENV['TEAMCITY_VERSION'].nil?)
 
 task :default => :compile
 
@@ -56,11 +57,12 @@
 
   tests.files = FileList["source/#{PROJECT_NAME}.Tests/bin/#{$config}/#{PROJECT_NAME}.Tests.dll"]
   tests.exe = nunit_path
-  tests.add_parameter "/framework=#{CLR_TOOLS_VERSION}"
-  tests.add_parameter "/noshadow"
-  tests.add_parameter "/nologo"
-  tests.add_parameter "/labels"
-  tests.add_parameter "/xml=#{File.join(ARTIFACTS_PATH, "nunit-test-results.xml")}"
+  tests.add_parameter "--labels=ALL"
+  tests.add_parameter "--noresult"
+  
+  if $teamcity
+    tests.add_parameter "--teamcity"
+  end  
 end
 
 desc 'Cleans build artifacts'
@@ -142,7 +144,7 @@
 end
 
 def nunit_path()
-  File.join(Dir.glob(File.join('source', 'packages', "nunit.runners.*")).sort.last, "tools", "nunit-console.exe")
+  File.join(Dir.glob(File.join('source', 'packages', "nunit.consolerunner.*")).sort.last, "tools", "nunit3-console.exe")
 end
 
 def nuget_path()
diff --git a/source/.nuget/packages.config b/source/.nuget/packages.config
deleted file mode 100644
index 00c3236..0000000
--- a/source/.nuget/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit.Runners" version="2.6.2" />
-</packages>
\ No newline at end of file
diff --git a/source/WcfClientProxyGenerator.Tests/packages.config b/source/WcfClientProxyGenerator.Tests/packages.config
index 9609df2..92e2491 100644
--- a/source/WcfClientProxyGenerator.Tests/packages.config
+++ b/source/WcfClientProxyGenerator.Tests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.2.1" targetFramework="net45" />
+  <package id="NUnit.ConsoleRunner" version="3.2.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/source/WcfClientProxyGenerator.sln b/source/WcfClientProxyGenerator.sln
index 4eab9d2..2a60148 100644
--- a/source/WcfClientProxyGenerator.sln
+++ b/source/WcfClientProxyGenerator.sln
@@ -1,15 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfClientProxyGenerator", "WcfClientProxyGenerator\WcfClientProxyGenerator.csproj", "{56614D90-9EEA-4908-8BEB-7CD6E35BFCB0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfClientProxyGenerator.Tests", "WcfClientProxyGenerator.Tests\WcfClientProxyGenerator.Tests.csproj", "{C8B3B23C-F719-4F31-B6B7-8F02B3A817FA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{EDEEE88F-2834-4EB7-8C45-E66602669B5E}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU