diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd80a88ee..60c88b891 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -201,5 +201,5 @@ jobs:
     - name: Run Cuis-Smalltalk tests on TruffleSqueak standalone
       run: |
         mx.trufflesqueak/utils.sh download-cuis-test-image
-        trufflesqueak --vm.ea --vm.esa --headless --experimental-options --smalltalk.resource-summary=true --engine.CompilationFailureAction=ExitVM --engine.TreatPerformanceWarningsAsErrors=call,instanceof,store,trivial --engine.CompilationStatistics images/Cuis6.0-????.image -s src/de.hpi.swa.trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/runCuisTests.st
+        trufflesqueak --vm.ea --vm.esa --headless --experimental-options --smalltalk.resource-summary=true --compiler.TreatPerformanceWarningsAsErrors=call,instanceof,store,trivial --engine.CompilationFailureAction=ExitVM --engine.CompilationStatistics images/Cuis6.0-????.image -s src/de.hpi.swa.trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/runCuisTests.st
       if: ${{ matrix.os == 'ubuntu-20.04' }}
diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py
index 0986405e6..53918d2d4 100644
--- a/mx.trufflesqueak/mx_trufflesqueak.py
+++ b/mx.trufflesqueak/mx_trufflesqueak.py
@@ -90,8 +90,8 @@ def _add_unit_tests(tasks, supports_coverage):
                                   '--color', '--enable-timing'])
             if _COMPILER:
                 unittest_args.extend(['-Dgraal.CompilationFailureAction=ExitVM',
+                                      '-Dpolyglot.compiler.TreatPerformanceWarningsAsErrors=call,instanceof,store,trivial',
                                       '-Dpolyglot.engine.CompilationFailureAction=ExitVM',
-                                      '-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=call,instanceof,store,trivial',
                                       '-Dpolyglot.engine.CompilationStatistics=true'])
 
             # Ensure Truffle TCK disabled (workaround needed since GraalVM 19.2.0)