diff --git a/assets/Product.wxs b/assets/Product.wxs
index 699bffb500..cbc8489192 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -9,8 +9,8 @@
   <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
   <?if $(sys.BUILDARCH)=x64?>
     <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.SimpleProductVersion)"?>
-    <?define UpgradeCodePreview = "31ab5147-9a97-4452-8443-d9709f0516e1"?>
-    <?define UpgradeCodeRelease = "39243d76-adaf-42b1-94fb-16ecf83237c8"?>
+    <?define UpgradeCodePreview = "39243d76-adaf-42b1-94fb-16ecf83237c8"?>
+    <?define UpgradeCodeRelease = "31ab5147-9a97-4452-8443-d9709f0516e1"?>
     <?if $(var.IsPreview)=True?>
       <?define UpgradeCode = $(var.UpgradeCodePreview)?>
     <?else?>
@@ -18,8 +18,8 @@
     <?endif?>
   <?else?>
     <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.SimpleProductVersion) ($(sys.BUILDARCH))"?>
-    <?define UpgradeCodePreview = "1d00683b-0f84-4db8-a64f-2f98ad42fe06"?>
-    <?define UpgradeCodeRelease = "86abcfbd-1ccc-4a88-b8b2-0facfde29094"?>
+    <?define UpgradeCodePreview = "86abcfbd-1ccc-4a88-b8b2-0facfde29094"?>
+    <?define UpgradeCodeRelease = "1d00683b-0f84-4db8-a64f-2f98ad42fe06"?>
     <?if $(var.IsPreview)=True?>
       <?define UpgradeCode = $(var.UpgradeCodePreview)?>
     <?else?>
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index ec488f6cf5..3189f13079 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -80,6 +80,34 @@ Describe -Name "Windows MSI" -Fixture {
         }
     }
 
+    Context "Upgrade code" {
+        BeforeAll {
+            $previewUpgladeCode = '39243d76-adaf-42b1-94fb-16ecf83237c8'
+        }
+
+        It "Preview MSI should not be installed before test" -Skip:(!(Test-Elevated)) {
+            $result = @(Get-CimInstance -Query "SELECT Value FROM Win32_Property WHERE Property='UpgradeCode' and Value = '{$previewUpgladeCode}'")
+            $result.Count | Should -Be 0 -Because 'Query should return nothing if preview x64 is not installed'
+        }
+
+        It "MSI should install without error" -Skip:(!(Test-Elevated)) {
+            {
+                Invoke-MsiExec -Install -MsiPath $msiX64Path -Properties @{ADD_PATH = 1}
+            } | Should -Not -Throw
+        }
+
+        It "Upgrade code should be correct" -Skip:(!(Test-Elevated)) {
+            $result = @(Get-CimInstance -Query "SELECT Value FROM Win32_Property WHERE Property='UpgradeCode' and Value = '{$previewUpgladeCode}'")
+            $result.Count | Should -Be 1 -Because 'Query should return 1 result if Upgrade code is for x64 preview'
+        }
+
+        It "MSI should uninstall without error" -Skip:(!(Test-Elevated)) {
+            {
+                Invoke-MsiExec -Uninstall -MsiPath $msiX64Path
+            } | Should -Not -Throw
+        }
+    }
+
     Context "Add Path disabled" {
         It "MSI should install without error" -Skip:(!(Test-Elevated)) {
             {