diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index bd98ad9162..60efab251a 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -18,15 +18,17 @@
 import cpp
 import codingstandards.cpp.autosar
 
-predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
+class CompilationWithNoWarnings extends Compilation {
+  CompilationWithNoWarnings() {
+    getAnArgument() = "-w" or
+    not getAnArgument().regexpMatch("-W[\\w=-]+")
+  }
+}
 
-predicate hasWarningOption(Compilation c) { c.getAnArgument().regexpMatch("-W[\\w=-]+") }
+predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
 
 from File f
 where
   not isExcluded(f, ToolchainPackage::compilerWarningLevelNotInComplianceQuery()) and
-  exists(Compilation c | f = c.getAFileCompiled() |
-    not hasResponseFileArgument(c) and
-    not hasWarningOption(c)
-  )
+  exists(CompilationWithNoWarnings c | f = c.getAFileCompiled() | not hasResponseFileArgument(c))
 select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
index e69de29bb2..81a5c4327e 100644
--- a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
+++ b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wcast-function-type.cpp:0:0:0:0 | Wcast-function-type.cpp | No warning-level options were used in the compilation of 'Wcast-function-type.cpp'. |
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.clang b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.clang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.gcc b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.gcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.qcc b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.qcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
index f405349bbb..79e42b4039 100644
--- a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
+++ b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
@@ -1,2 +1,14 @@
 // semmle-extractor-options: --clang -std=c++14 -Wcast-function-type
-// COMPLIANT
\ No newline at end of file
+// COMPLIAN
+
+// NOTE: When tested with `codeql test run`, the test extractor provides `-w`
+// which overrides `-Wcast-function-type` and causes this test case to be
+// non-compliant.
+//
+// However, when tested with our compiler matrix tests, this test db is built
+// via `codeql database create --command="..."`, and the `-w` flag will NOT be
+// used. This means the `-Wcast-function-type` flag is active and the test case
+// is compliant.
+//
+// Therefore, the .expected file for this test expects non-compliance, and the
+// .expected.gcc and .expected.clang files expect this test to be compliant.
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
index e69de29bb2..82ff1c0c36 100644
--- a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
+++ b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wall.cpp:0:0:0:0 | Wall.cpp | No warning-level options were used in the compilation of 'Wall.cpp'. |
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.clang b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.clang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.gcc b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.gcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.qcc b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.qcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/Wall.cpp b/cpp/autosar/test/rules/A1-1-2/Wall.cpp
index cb21e0601e..b42189a8d1 100644
--- a/cpp/autosar/test/rules/A1-1-2/Wall.cpp
+++ b/cpp/autosar/test/rules/A1-1-2/Wall.cpp
@@ -1,2 +1,12 @@
 // semmle-extractor-options: --clang -std=c++14 -Wall
-// COMPLIANT
\ No newline at end of file
+// COMPLIANT
+
+// NOTE: When tested with `codeql test run`, the test extractor provides `-w`
+// which overrides `-Wall` and causes this test case to be non-compliant.
+//
+// However, when tested with our compiler matrix tests, this test db is built
+// via `codeql database create --command="..."`, and the `-w` flag will NOT be
+// used. This means the `-Wall` flag is active and the test case is compliant.
+//
+// Therefore, the .expected file for this test expects non-compliance, and the
+// .expected.gcc and .expected.clang files expect this test to be compliant.
\ No newline at end of file