diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml
index 9498d7529b..53e7ac0e52 100644
--- a/.vsts-ci/templates/ci-general.yml
+++ b/.vsts-ci/templates/ci-general.yml
@@ -69,6 +69,12 @@ steps:
     workingDirectory: $(Build.SourcesDirectory)/vscode-powershell
     pwsh: true
 
+# Necessary on Linux to run VS Code unit tests
+- bash: |
+    /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  displayName: Start X virtual framebuffer
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
 # Tests in particular are run with either PowerShell Core or Windows PowerShell
 - task: PowerShell@2
   displayName: Run unit tests
@@ -82,6 +88,8 @@ steps:
       Invoke-Build -Configuration Release Test
     workingDirectory: $(Build.SourcesDirectory)/vscode-powershell
     pwsh: ${{ parameters.pwsh }}
+  env:
+    DISPLAY: ':99.0'
 
 - task: PowerShell@2
   displayName: Assert PowerShellEditorServices release configuration
diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1
index 9acf2fbc18..859c1711f8 100644
--- a/vscode-powershell.build.ps1
+++ b/vscode-powershell.build.ps1
@@ -109,7 +109,7 @@ task Build Restore, {
 #endregion
 #region Test tasks
 
-task Test -If (!($env:TF_BUILD -and $global:IsLinux)) Build, {
+task Test Build, {
     Write-Host "`n### Running extension tests" -ForegroundColor Green
     Invoke-BuildExec { & npm run test }
     # Reset the state of files modified by tests