diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index 65b8f556924..adfbf25d67a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -3683,9 +3683,13 @@ public enum DeviceGuardConfigCodeIntegrityStatus
     /// <summary>
     /// Device Guard hardware security properties
     /// </summary>
-    [SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Justification = "The underlying MOF definition does not contain a zero value. The converter method will handle it appropriately.")]
     public enum DeviceGuardHardwareSecure
     {
+        /// <summary>
+        /// Undefined (not part of the mof)
+        /// </summary>
+        Undefined = 0,
+
         /// <summary>
         /// Base Virtualization Support
         /// </summary>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
index a0e4629aae7..30364cb2ca4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
@@ -1365,6 +1365,7 @@ try {
                 $deviceGuard = Get-DeviceGuard
                 # can't get amended qualifiers using cim cmdlets so we define them here
                 $requiredSecurityPropertiesValues = @{
+                    "0" = "Undefined"
                     "1" = "BaseVirtualizationSupport"
                     "2" = "SecureBoot"
                     "3" = "DMAProtection"
@@ -1389,7 +1390,8 @@ try {
                 }
                 else
                 {
-                    $observed.DeviceGuardRequiredSecurityProperties | Should Not BeNullOrEmpty
+                    $deviceGuard.RequiredSecurityProperties.Count | Should BeGreaterThan 0
+                    $observed.DeviceGuardRequiredSecurityProperties.Count | Should BeGreaterThan 0
                     [string]::Join(",", $observed.DeviceGuardRequiredSecurityProperties) | Should Be (Get-StringValuesFromValueMap -valuemap $requiredSecurityPropertiesValues -values $deviceGuard.RequiredSecurityProperties)
                 }
                 $observed.DeviceGuardAvailableSecurityProperties | Should Be $deviceGuard.AvailableSecurityProperties