diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh
index 99b158265..2e80198d0 100644
--- a/images/macos/provision/configuration/configure-machine.sh
+++ b/images/macos/provision/configuration/configure-machine.sh
@@ -57,7 +57,7 @@ done
 rm -f ./add-certificate
 
 # enable-automationmode-without-authentication
-if is_Monterey; then
+if ! is_BigSur; then
 retry=10
 while [ $retry -gt 0 ]; do
 {
diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1
index c71a2c8f1..4d56aafcd 100644
--- a/images/macos/tests/System.Tests.ps1
+++ b/images/macos/tests/System.Tests.ps1
@@ -55,7 +55,7 @@ Describe "Open windows" -Skip:(isVeertu) {
 }
 
 Describe "AutomationModeTool" {
-    It "Does not require user authentication" -Skip:(-not $os.IsMonterey) {
+    It "Does not require user authentication" -Skip:($os.IsBigSur) {
         automationmodetool | Out-String | Should -Match "DOES NOT REQUIRE"
     }
 }