diff --git a/GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs b/GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs.tt
similarity index 94%
rename from GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs
rename to GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs.tt
index 9a5bae340..9eaf4416a 100644
--- a/GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs
+++ b/GoogleTestAdapter/Tests.Common/AbstractConsoleIntegrationTests.cs.tt
@@ -1,4 +1,7 @@
-// This file has been modified by Microsoft on 6/2017.
+<#@ template language="c#" hostspecific="true" #> 
+<#@ output extension=".cs" #> 
+<#@ parameter type="System.String" name="TestAdapterFlavor" #> 
+// This file has been modified by Microsoft on 8/2017.
 
 using System.Collections.Generic;
 using System.IO;
@@ -44,7 +47,11 @@ public static void GetDirectories(out string testAdapterDir, out string testSolu
             match.Success.Should().BeTrue();
             string binariesPath = match.Groups[1].Value;
             string debugOrRelease = match.Groups[2].Value;
+<# if (TestAdapterFlavor == "GTA") { #>
             testAdapterDir = Path.Combine(binariesPath, "GoogleTestAdapter", debugOrRelease, "Packaging.GTA");
+<# } else if (TestAdapterFlavor == "TAfGT") { #>
+            testAdapterDir = Path.Combine(binariesPath, "GoogleTestAdapter", debugOrRelease, "Packaging.TAfGT");
+<# } #>
             testSolutionFile = Path.Combine(binariesPath, @"..\..\SampleTests\SampleTests.sln");
         }
 
diff --git a/GoogleTestAdapter/VsPackage.TAfGT/packages.config b/GoogleTestAdapter/VsPackage.TAfGT/packages.config
index c5ddcac55..832b99531 100644
--- a/GoogleTestAdapter/VsPackage.TAfGT/packages.config
+++ b/GoogleTestAdapter/VsPackage.TAfGT/packages.config
@@ -3,4 +3,5 @@
   <package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.TestPlatform.ObjectModel" version="15.0.1" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="15.0.26510-d15rel" targetFramework="net46" />
+  <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net46" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/ResolveTTs.proj b/ResolveTTs.proj
index c4565d503..eb309dde8 100644
--- a/ResolveTTs.proj
+++ b/ResolveTTs.proj
@@ -31,6 +31,10 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <OutputFileName>app.config</OutputFileName>
     </Content>
+    <Content Include="GoogleTestAdapter\Tests.Common\AbstractConsoleIntegrationTests.cs.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <OutputFileName>AbstractConsoleIntegrationTests.cs</OutputFileName>
+    </Content>
     <Content Include="GoogleTestAdapter\VsPackage.GTA.Tests.Unit\app.config.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <OutputFileName>app.config</OutputFileName>