diff --git a/scripts/matrix_testing/CreateMatrixTestReport.ps1 b/scripts/matrix_testing/CreateMatrixTestReport.ps1
index a2ae220dad..6928154d4d 100644
--- a/scripts/matrix_testing/CreateMatrixTestReport.ps1
+++ b/scripts/matrix_testing/CreateMatrixTestReport.ps1
@@ -321,7 +321,7 @@ $jobRows = $queriesToCheck | ForEach-Object -ThrottleLimit $NumThreads -Parallel
             ###########################################################
             # Push context 
             ###########################################################
-            $fileSet = (Get-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language  -TestDirectory $testDirectory)
+            $fileSet = (Get-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language  -TestDirectory $testDirectory -Query $CurrentQueryName)
             
             if($fileSet){
                 $context = Push-CompilerSpecificFiles -Configuration $using:Configuration -Language $using:Language -FileSet $fileSet
diff --git a/scripts/matrix_testing/Get-CompilerSpecificFiles.ps1 b/scripts/matrix_testing/Get-CompilerSpecificFiles.ps1
index 6c06d0a66a..6197a05650 100644
--- a/scripts/matrix_testing/Get-CompilerSpecificFiles.ps1
+++ b/scripts/matrix_testing/Get-CompilerSpecificFiles.ps1
@@ -9,7 +9,10 @@ function Get-CompilerSpecificFiles {
         $Language,
         [Parameter(Mandatory)] 
         [string]
-        $TestDirectory
+        $TestDirectory,
+        [Parameter(Mandatory)] 
+        [string]
+        $Query
         )
     #
     # Convention is as follows:
@@ -28,7 +31,7 @@ function Get-CompilerSpecificFiles {
         $f
     }
 
-    foreach($f in (Get-ChildItem -Filter "*.expected.$Configuration" $TestDirectory)){
+    foreach($f in (Get-ChildItem -Filter "$Query.expected.$Configuration" $TestDirectory)){
         Write-Host "Found file $f..."
         $f 
     }