diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml
index cc60fee153..0151b8ef42 100644
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -41,16 +41,15 @@ jobs:
   steps:
   - template: win32/sql-product-build-win32.yml
 
-# Temporarily disable Windows_Test job given build machine setup issues
-# - job: Windows_Test
-#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-#   pool:
-#     name: mssqltools
-#   dependsOn:
-#   - Linux
-#   - Windows
-#   steps:
-#   - template: win32/sql-product-test-win32.yml
+- job: Windows_Test
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
+  pool:
+    name: mssqltools
+  dependsOn:
+  - Linux
+  - Windows
+  steps:
+  - template: win32/sql-product-test-win32.yml
 
 - job: Release
   condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule'))))
@@ -60,7 +59,7 @@ jobs:
   - macOS
   - Linux
   - Windows
-  # - Windows_Test
+  - Windows_Test
   steps:
   - template: sql-release.yml