diff --git a/Kudu.FunctionalTests/GitDeploymentTests.cs b/Kudu.FunctionalTests/GitDeploymentTests.cs
index 8531bba32..e6ee74078 100644
--- a/Kudu.FunctionalTests/GitDeploymentTests.cs
+++ b/Kudu.FunctionalTests/GitDeploymentTests.cs
@@ -376,57 +376,68 @@ public void PushAndDeployPreviewMvc5()
     }
 
     [KuduXunitTestClass]
-    public class AspNetCoreRC3CliWithLibTests : GitDeploymentTests
+    public class AspNetCore2VS17WithLibTests : GitDeploymentTests
     {
         [Fact]
         [KuduXunitTest(PrivateOnly = true)]
-        public void PushAndDeployAspNetCoreRC3CliWithLib()
+        public void PushAndDeployAspNetCore2VS17WithLib()
         {
-            PushAndDeployApps("AspNetCoreRC3CliWithLib", "master", "MvcApp", HttpStatusCode.OK, "Deployment successful");
+            PushAndDeployApps("AspNetCore2.0.0VS17WithLib", "master", "DotNetCore200", HttpStatusCode.OK, "Deployment successful");
         }
     }
 
     [KuduXunitTestClass]
-    public class AspNetCore2CliWithLibTests : GitDeploymentTests
+    public class AspNetCore10VS17WithLibTests : GitDeploymentTests
     {
         [Fact]
         [KuduXunitTest(PrivateOnly = true)]
-        public void PushAndDeployAspNetCore2CliWithLib()
+        public void PushAndDeployAspNetCore10VS17WithLib()
         {
-            PushAndDeployApps("AspNetCore2.0CliWithLib", "master", "lib success", HttpStatusCode.OK, "Deployment successful");
+            PushAndDeployApps("AspNetCore1.0.0VS17WithLib", "master", "DotNetCore100", HttpStatusCode.OK, "Deployment successful");
         }
     }
 
     [KuduXunitTestClass]
-    public class AspNetCoreRC4WebApiVsSlnTests : GitDeploymentTests
+    public class AspNetCore11VS17WithLibTests : GitDeploymentTests
     {
         [Fact]
         [KuduXunitTest(PrivateOnly = true)]
-        public void PushAndDeployAspNetCoreRC4WebApiVsSln()
+        public void PushAndDeployAspNetCore11VS17WithLib()
         {
-            PushAndDeployApps("AspNetCoreRC4WebApiVsSln", "master", "[\"classlibrary\",\"netstandard\"]", HttpStatusCode.OK, "Deployment successful", resourcePath: "/api/values");
+            PushAndDeployApps("AspNetCore1.1.0VS17WithLib", "master", "DotNetCore110", HttpStatusCode.OK, "Deployment successful");
+        }
+    }
+
+    [KuduXunitTestClass]
+    public class AspNetCore2CliWithLibTests : GitDeploymentTests
+    {
+        [Fact]
+        [KuduXunitTest(PrivateOnly = true)]
+        public void PushAndDeployAspNetCore2CliWithLib()
+        {
+            PushAndDeployApps("AspNetCore2.0CliWithLib", "master", "lib success", HttpStatusCode.OK, "Deployment successful");
         }
     }
 
     [KuduXunitTestClass]
-    public class AspNetCoreYeomanProjectTest : GitDeploymentTests
+    public class AspNetCore2CliTests : GitDeploymentTests
     {
         [Fact]
         [KuduXunitTest(PrivateOnly = true)]
-        public void PushAndDeployAspNetCoreYeomanProject()
+        public void PushAndDeployAspNetCore2Cli()
         {
-            PushAndDeployApps("AspNetCoreYeomanProject", "master", "[\"value1\",\"value2\"]", HttpStatusCode.OK, "Deployment successful", resourcePath: "/api/values");
+            PushAndDeployApps("AspNetCore2.0.0Cli", "master", "Hello World!", HttpStatusCode.OK, "Deployment successful");
         }
     }
 
     [KuduXunitTestClass]
-    public class AspNetCoreRC4WebApiCliTests : GitDeploymentTests
+    public class AspNetCoreRC4WebApiVsSlnTests : GitDeploymentTests
     {
         [Fact]
         [KuduXunitTest(PrivateOnly = true)]
-        public void PushAndDeployAspNetCoreRC4WebApiCli()
+        public void PushAndDeployAspNetCoreRC4WebApiVsSln()
         {
-            PushAndDeployApps("AspNetCoreRC4WebApiCli", "master", "[\"value1\",\"value2\"]", HttpStatusCode.OK, "Deployment successful", resourcePath: "/api/values");
+            PushAndDeployApps("AspNetCoreRC4WebApiVsSln", "master", "[\"classlibrary\",\"netstandard\"]", HttpStatusCode.OK, "Deployment successful", resourcePath: "/api/values");
         }
     }
 
diff --git a/Kudu.TestHarness/TestRepositories.cs b/Kudu.TestHarness/TestRepositories.cs
index 0a7af201b..31d54db43 100644
--- a/Kudu.TestHarness/TestRepositories.cs
+++ b/Kudu.TestHarness/TestRepositories.cs
@@ -12,11 +12,12 @@ internal class TestRepositories
             new TestRepositoryInfo("git@github.com:KuduQAOrg/RepoWithPrivateSubModule.git",         "4820516"),
             new TestRepositoryInfo("https://github.com/KuduApps/-benr-.git",                        "c553978"),
             new TestRepositoryInfo("https://github.com/KuduApps/AppWithPostBuildEvent.git",         "083b651"),
-            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore2.0CliWithLib.git",       "4bd5890"),
-            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCoreRC3CliWithLib.git",       "d8a1286"),
-            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCoreRC4WebApiCli.git",        "96168e9"),
-            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCoreRC4WebApiVsSln.git",      "3907f92"),
-            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCoreYeomanProject.git",       "66c2caf"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore1.0.0VS17WithLib.git",    "4143130"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore1.1.0VS17WithLib.git",    "3465591"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore2.0CliWithLib.git",       "afdb55e"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore2.0.0Cli.git",            "27ab60f"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCore2.0.0VS17WithLib.git",    "23d74c5"),
+            new TestRepositoryInfo("https://github.com/KuduApps/AspNetCoreRC4WebApiVsSln.git",      "61585d7"),
             new TestRepositoryInfo("https://github.com/KuduApps/Bakery.git",                        "2f29dc6"),
             new TestRepositoryInfo("https://github.com/KuduApps/BasicConsoleWorker.git",            "ce1ec74"),
             new TestRepositoryInfo("https://github.com/KuduApps/ConditionalCompilation.git",        "946159e"),