diff --git a/images/macos/helpers/Xcode.Helpers.psm1 b/images/macos/helpers/Xcode.Helpers.psm1
index 8ea137e6..52a182d5 100644
--- a/images/macos/helpers/Xcode.Helpers.psm1
+++ b/images/macos/helpers/Xcode.Helpers.psm1
@@ -46,11 +46,17 @@ function Switch-Xcode {
 }
 
 function Test-XcodeStableRelease {
-    param(
-        [Parameter(Mandatory)]
+    param (
+        [Parameter(ParameterSetName = 'Version')]
+        [string] $Version,
+        [Parameter(ParameterSetName = 'Path')]
         [string] $XcodeRootPath
     )
 
+    if ($PSCmdlet.ParameterSetName -eq "Version") {
+        $XcodeRootPath = Get-XcodeRootPath $Version
+    }
+
     $licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist"
     $releaseType = & defaults read $licenseInfoPlistPath "licenseType"
     return -not ($releaseType -match "beta")
@@ -102,17 +108,4 @@ function Get-XcodePairsList {
         $result += "$watchName $phoneName"
     }
     return $result
-}
-
-function Test-XcodeStableVersion {
-    param([Parameter(Mandatory)][string]$Version)
-
-    if ($Version -match "beta") {
-        return $false
-    }
-    if ($Version -match "GM") {
-        return $false
-    }
-
-    return $true
 }
\ No newline at end of file
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index f8e7ccfe..dc03e400 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -56,7 +56,7 @@ Describe "Xcode" {
     }
 
     Context "XCODE_DEVELOPER_DIR" {
-        $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ }
+        $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ }
         $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique
         $testCases = $majorXcodeVersions | ForEach-Object {
             $majorXcodeVersion = $_
@@ -84,7 +84,7 @@ Describe "Xcode" {
 }
 
 Describe "Xcode simulators" {
-    $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } | ForEach-Object {
+    $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object {
         Switch-Xcode -Version $_
 
         Context "$_" {