diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee12d4e7e..69c00d896 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 - xWebAdminstration
   - Integration tests are running on more Microsoft-hosted agents to
     test all possible operating systems ([issue #550](https://github.com/PowerShell/xWebAdministration/issues/550)).
+  - Fix a few lingering bugs in CICD ([issue #567](https://github.com/PowerShell/xWebAdministration/issues/567))
 
 ### Changed
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 61a27352e..fbac67738 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -251,7 +251,16 @@ stages:
           - powershell: |
               Set-Service -Name wuauserv -StartupType Manual -Verbose
               Start-Service -name wuauserv -Verbose
-              Install-WindowsFeature -IncludeAllSubFeature -Name 'Web-Server' -Verbose
+              $features = @(
+                'Web-Common-Http','Web-Health','Web-Performance',
+                'Web-Security','Web-AppInit',
+                'Web-CGI','Web-ISAPI-Ext','Web-ISAPI-Filter',
+                'Web-Includes','Web-WebSockets', 'Web-Scripting-Tools', 'Web-Mgmt-Service'
+              )
+              foreach($feature in $features) {
+                Write-Host $feature
+                Install-WindowsFeature -IncludeAllSubFeature -Name $feature -Verbose
+              }
             name: InstallWebServerFeature
           - task: PowerShell@2
             name: test
diff --git a/tests/TestHelper/CommonTestHelper.psm1 b/tests/TestHelper/CommonTestHelper.psm1
index c0c48f1d3..70feb0c8a 100644
--- a/tests/TestHelper/CommonTestHelper.psm1
+++ b/tests/TestHelper/CommonTestHelper.psm1
@@ -41,6 +41,7 @@ function Install-NewSelfSignedCertificateExScript
             Remove-Item -Path $newSelfSignedCertZipPath -Force
         }
 
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
         Invoke-WebRequest -Uri $newSelfSignedCertURL -OutFile $newSelfSignedCertZipPath
 
         Add-Type -AssemblyName System.IO.Compression.FileSystem