diff --git a/analyzers/tests/SonarAnalyzer.TestFramework.Test/Common/SourceGeneratorProviderTest.cs b/analyzers/tests/SonarAnalyzer.TestFramework.Test/Common/SourceGeneratorProviderTest.cs
index 7528058ce42..7762f604e60 100644
--- a/analyzers/tests/SonarAnalyzer.TestFramework.Test/Common/SourceGeneratorProviderTest.cs
+++ b/analyzers/tests/SonarAnalyzer.TestFramework.Test/Common/SourceGeneratorProviderTest.cs
@@ -56,7 +56,7 @@ public void LatestSdkFolder_ReturnLatest()
         Version.TryParse(Path.GetFileName(latestSdkFolder), out var latestSdkVersion).Should().BeTrue($"'{latestSdkFolder}' cannot be parsed to a version number");
         var parentDirectory = Directory.GetParent(latestSdkFolder);
         parentDirectory.Name.Should().Be("sdk", "Parent directory of the latest SDK should be 'sdk'");
-        Directory.GetDirectories(parentDirectory.FullName, $"{typeof(object).Assembly.GetName().Version.Major}.*", SearchOption.TopDirectoryOnly)
+        Directory.GetDirectories(parentDirectory.FullName, $"{typeof(object).Assembly.GetName().Version.Major}.*")
             .Should().NotContain(x => IsHigherVersion(x, latestSdkVersion), "There should be no SDK folders with a higher version number than the latest SDK folder");
     }
 
diff --git a/analyzers/tests/SonarAnalyzer.TestFramework/Common/SourceGeneratorProvider.cs b/analyzers/tests/SonarAnalyzer.TestFramework/Common/SourceGeneratorProvider.cs
index ebabc7a4985..56c9fc04806 100644
--- a/analyzers/tests/SonarAnalyzer.TestFramework/Common/SourceGeneratorProvider.cs
+++ b/analyzers/tests/SonarAnalyzer.TestFramework/Common/SourceGeneratorProvider.cs
@@ -46,11 +46,9 @@ public static string LatestSdkFolder()
                 $"This may be because you are not using .NET Core. " +
                 $"Please note that Razor analysis is only supported when using .NET Core.");
         }
-        return Directory.GetDirectories(sdkDirectory, $"{objectAssembly.GetName().Version.Major}.*", SearchOption.TopDirectoryOnly)
+        return Directory.GetDirectories(sdkDirectory, $"{objectAssembly.GetName().Version.Major}.*")
             .OrderByDescending(x => Version.Parse(new DirectoryInfo(x).Name))
-            .FirstOrDefault() is { } latestSdkDirectory
-                ? latestSdkDirectory
-                : throw new DirectoryNotFoundException($"SDK directory not found for version {objectAssembly.GetName().Version.Major}");
+            .First();
     }
 
     private sealed class AssemblyLoader : IAnalyzerAssemblyLoader