diff --git a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
index b6e40ada280..48d32e3236e 100644
--- a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
+++ b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
@@ -9,6 +9,7 @@
             "test_aks_nodepool_add_with_ossku"
         ],
         "need additional feature": [
+            "test_aks_create_enable_encryption",
             "test_aks_create_edge_zone",
             "test_aks_create_with_auto_upgrade_channel",
             "test_aks_enable_openservicemesh_addon",
diff --git a/src/aks-preview/azext_aks_preview/decorator.py b/src/aks-preview/azext_aks_preview/decorator.py
index 6fd41cdb82f..c6eddda763f 100644
--- a/src/aks-preview/azext_aks_preview/decorator.py
+++ b/src/aks-preview/azext_aks_preview/decorator.py
@@ -514,20 +514,24 @@ def get_addon_consts(self) -> Dict[str, str]:
         from azext_aks_preview._consts import (
             ADDONS,
             CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
-            CONST_GITOPS_ADDON_NAME,
+            CONST_ROTATION_POLL_INTERVAL,
             CONST_SECRET_ROTATION_ENABLED,
+            CONST_GITOPS_ADDON_NAME,
             CONST_MONITORING_USING_AAD_MSI_AUTH,
         )
 
         addon_consts = super().get_addon_consts()
         addon_consts["ADDONS"] = ADDONS
-        addon_consts["CONST_GITOPS_ADDON_NAME"] = CONST_GITOPS_ADDON_NAME
         addon_consts[
             "CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME"
         ] = CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME
+        addon_consts[
+            "CONST_ROTATION_POLL_INTERVAL"
+        ] = CONST_ROTATION_POLL_INTERVAL
         addon_consts[
             "CONST_SECRET_ROTATION_ENABLED"
         ] = CONST_SECRET_ROTATION_ENABLED
+        addon_consts["CONST_GITOPS_ADDON_NAME"] = CONST_GITOPS_ADDON_NAME
         addon_consts[
             "CONST_MONITORING_USING_AAD_MSI_AUTH"
         ] = CONST_MONITORING_USING_AAD_MSI_AUTH
diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
index 405f20d1315..83a8e62a81e 100644
--- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
+++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
@@ -433,6 +433,7 @@ def test_aks_create_with_openservicemesh_addon(self, resource_group, resource_gr
         })
 
         create_cmd = 'aks create --resource-group={resource_group} --name={name} --enable-managed-identity ' \
+                     '--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AKS-OpenServiceMesh ' \
                      '-a open-service-mesh --ssh-key-value={ssh_key_value} -o json'
         self.cmd(create_cmd, checks=[
             self.check('provisioningState', 'Succeeded'),
diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py b/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py
index a97d31361a2..3d479f0ed4c 100644
--- a/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py
+++ b/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py
@@ -9,29 +9,13 @@
 
 from azext_aks_preview.__init__ import register_aks_preview_resource_type
 from azext_aks_preview._client_factory import CUSTOM_MGMT_AKS_PREVIEW
-from azext_aks_preview.decorator import (
-    AKSPreviewContext,
-    AKSPreviewCreateDecorator,
-    AKSPreviewModels,
-    AKSPreviewUpdateDecorator,
-)
-from azext_aks_preview.tests.latest.mocks import MockCLI, MockClient, MockCmd
-from azext_aks_preview.tests.latest.test_aks_commands import _get_test_data_file
-from azure.cli.command_modules.acs._consts import DecoratorMode
-from azure.cli.core.azclierror import (
-    ArgumentUsageError,
-    CLIInternalError,
-    InvalidArgumentValueError,
-    MutuallyExclusiveArgumentError,
-    NoTTYError,
-    RequiredArgumentMissingError,
-    UnknownError,
-)
 from azext_aks_preview._consts import (
     ADDONS,
     CONST_ACC_SGX_QUOTE_HELPER_ENABLED,
+    CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
     CONST_AZURE_POLICY_ADDON_NAME,
     CONST_CONFCOM_ADDON_NAME,
+    CONST_GITOPS_ADDON_NAME,
     CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME,
     CONST_INGRESS_APPGW_ADDON_NAME,
     CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID,
@@ -42,13 +26,30 @@
     CONST_KUBE_DASHBOARD_ADDON_NAME,
     CONST_MONITORING_ADDON_NAME,
     CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID,
+    CONST_MONITORING_USING_AAD_MSI_AUTH,
     CONST_OPEN_SERVICE_MESH_ADDON_NAME,
+    CONST_ROTATION_POLL_INTERVAL,
+    CONST_SECRET_ROTATION_ENABLED,
     CONST_VIRTUAL_NODE_ADDON_NAME,
     CONST_VIRTUAL_NODE_SUBNET_NAME,
-    CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
-    CONST_GITOPS_ADDON_NAME,
-    CONST_SECRET_ROTATION_ENABLED,
-    CONST_MONITORING_USING_AAD_MSI_AUTH,
+)
+from azext_aks_preview.decorator import (
+    AKSPreviewContext,
+    AKSPreviewCreateDecorator,
+    AKSPreviewModels,
+    AKSPreviewUpdateDecorator,
+)
+from azext_aks_preview.tests.latest.mocks import MockCLI, MockClient, MockCmd
+from azext_aks_preview.tests.latest.test_aks_commands import _get_test_data_file
+from azure.cli.command_modules.acs._consts import DecoratorMode
+from azure.cli.core.azclierror import (
+    ArgumentUsageError,
+    CLIInternalError,
+    InvalidArgumentValueError,
+    MutuallyExclusiveArgumentError,
+    NoTTYError,
+    RequiredArgumentMissingError,
+    UnknownError,
 )
 
 
@@ -516,8 +517,10 @@ def test_get_addon_consts(self):
             "CONST_VIRTUAL_NODE_ADDON_NAME": CONST_VIRTUAL_NODE_ADDON_NAME,
             "CONST_VIRTUAL_NODE_SUBNET_NAME": CONST_VIRTUAL_NODE_SUBNET_NAME,
             "CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME": CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
-            "CONST_GITOPS_ADDON_NAME": CONST_GITOPS_ADDON_NAME,
             "CONST_SECRET_ROTATION_ENABLED": CONST_SECRET_ROTATION_ENABLED,
+            "CONST_ROTATION_POLL_INTERVAL": CONST_ROTATION_POLL_INTERVAL,
+            # new in aks-preview
+            "CONST_GITOPS_ADDON_NAME": CONST_GITOPS_ADDON_NAME,
             "CONST_MONITORING_USING_AAD_MSI_AUTH": CONST_MONITORING_USING_AAD_MSI_AUTH,
         }
         self.assertEqual(addon_consts, ground_truth_addon_consts)