diff --git a/.azure-devops/templates/evaluate-command-table.yml b/.azure-devops/templates/evaluate-command-table.yml
index eec3ee92b..956150b27 100644
--- a/.azure-devops/templates/evaluate-command-table.yml
+++ b/.azure-devops/templates/evaluate-command-table.yml
@@ -20,6 +20,7 @@ steps:
         source ./venv/bin/activate
         git clone --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
         pip install azdev
+        pip install wheel==0.30.0 setuptools==70.0.0
         azdev --version
         azdev setup -c ../azure-cli -r ./
         AZURE_EXTENSION_DIR=~/.azure/cliextensions
@@ -30,4 +31,6 @@ steps:
           az extension add --source $i -y --debug
         done
         cp ./linter_exclusions.yml $AZURE_EXTENSION_DIR/azure-iot/
+        # temp fix for newest azdev v0.1.65
+        cp .pylintrc pylintrc
         azdev linter --include-whl-extensions azure-iot --min-severity medium
diff --git a/azext_iot/tests/iothub/devices/test_iothub_device_tracing.py b/azext_iot/tests/iothub/devices/test_iothub_device_tracing.py
index 46e9f3aa2..5311adbb6 100644
--- a/azext_iot/tests/iothub/devices/test_iothub_device_tracing.py
+++ b/azext_iot/tests/iothub/devices/test_iothub_device_tracing.py
@@ -51,7 +51,7 @@ def test_iothub_device_distributed_tracing(self):
             result = self.cmd(
                 self.set_cmd_auth_type(
                     f"iot hub distributed-tracing update "
-                    f"-d {device_ids[0]} -n {self.host_name} -g { self.entity_rg} --sm on --sr 50",
+                    f"-d {device_ids[0]} -n {self.host_name} -g {self.entity_rg} --sm on --sr 50",
                     auth_type=auth_phase,
                 )
             ).get_output_in_json()
diff --git a/setup.py b/setup.py
index a27502a37..308278e87 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 DEPENDENCIES = [
     "azure-core>=1.24.0,<2.0.0",
     "azure-mgmt-core>=1.3.0,<2.0.0",
-    "azure-identity>=1.6.1,<2.0.0",
+    "azure-identity>=1.6.1,<1.18.0",
     "azure-storage-blob>=12.14.0,<13.0.0",
     "msrest>=0.6.21",
     "msrestazure>=0.6.3,<2.0.0",