diff --git a/test/E2ETests/DeploymentUtility.cs b/test/E2ETests/DeploymentUtility.cs
index 25e1d71e52..59cf8b3a79 100644
--- a/test/E2ETests/DeploymentUtility.cs
+++ b/test/E2ETests/DeploymentUtility.cs
@@ -19,7 +19,7 @@ namespace E2ETests
             var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe");
 
             // Get path to 64 bit of IIS Express
-            if (architecture == KreArchitecture.x64)
+            if (architecture == KreArchitecture.amd64)
             {
                 iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe");
 
@@ -186,9 +186,9 @@ namespace E2ETests
             StringBuilder replaceStr = new StringBuilder();
             replaceStr.Append("KRE");
             replaceStr.Append((kreFlavor == KreFlavor.CoreClr) ? "-CoreCLR" : "-CLR");
-            replaceStr.Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-x64");
+            replaceStr.Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-amd64");
 
-            pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)50-(x86|x64)", replaceStr.ToString(), RegexOptions.IgnoreCase);
+            pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)-(x86|amd64)", replaceStr.ToString(), RegexOptions.IgnoreCase);
 
             Console.WriteLine();
             Console.WriteLine("Setting %PATH% value to : {0}", pathValue);
diff --git a/test/E2ETests/KreArchitecture.cs b/test/E2ETests/KreArchitecture.cs
index e12d87eb1c..04f0772a8b 100644
--- a/test/E2ETests/KreArchitecture.cs
+++ b/test/E2ETests/KreArchitecture.cs
@@ -2,7 +2,7 @@
 {
     public enum KreArchitecture
     {
-        x64,
+        amd64,
         x86
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs
index c75d89c4a0..258206b13c 100644
--- a/test/E2ETests/SmokeTests.cs
+++ b/test/E2ETests/SmokeTests.cs
@@ -20,10 +20,10 @@ namespace E2ETests
         [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/", false)]
         [InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/", false)]
         [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/", false)]
-        [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x64, "http://localhost:5002/", false)]
+        [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/", false)]
         [InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/", true)]
-        [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5001/", false)]
-        [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5004/", false)]
+        [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/", false)]
+        [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5004/", false)]
         public void SmokeTestSuite(ServerType hostType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl, bool RunTestOnMono = false)
         {
             Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", hostType, kreFlavor, architecture, applicationBaseUrl);
@@ -45,7 +45,7 @@ namespace E2ETests
             }
 
             // Check if processor architecture is x64, else skip test
-            if (architecture == KreArchitecture.x64 && !Environment.Is64BitOperatingSystem)
+            if (architecture == KreArchitecture.amd64 && !Environment.Is64BitOperatingSystem)
             {
                 Console.WriteLine("Skipping x64 test since machine is of type x86");
                 Assert.True(true);