diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/utilities.py b/src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/utilities.py
index 98be0bccebc..976c22f76de 100644
--- a/src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/utilities.py
+++ b/src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/utilities.py
@@ -70,9 +70,10 @@ def trim_kwargs_from_test_function(fn, kwargs):
     # the next function is the actual test function. the kwargs need to be trimmed so
     # that parameters which are not required will not be passed to it.
     if not is_preparer_func(fn):
-        args, _, kw, _ = inspect.getargspec(fn)  # pylint: disable=deprecated-method
-        if kw is None:
-            args = set(args)
+        sig = inspect.signature(fn)
+        if not any(param.kind == inspect.Parameter.VAR_KEYWORD
+                   for param in sig.parameters.values()):
+            args = set(sig.parameters.keys())
             for key in [k for k in kwargs if k not in args]:
                 del kwargs[key]
 
diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_t1/key_vault_authentication.py b/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_t1/key_vault_authentication.py
index 095645afe07..6ac13675915 100644
--- a/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_t1/key_vault_authentication.py
+++ b/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_t1/key_vault_authentication.py
@@ -59,7 +59,7 @@ def __init__(self, authorization_callback):
     # for backwards compatibility we need to support callbacks which don't accept the scheme
     def _auth_callback_compat(self, server, resource, scope, scheme):
         return self._user_callback(server, resource, scope) \
-            if len(inspect.getargspec(self._user_callback).args) == 3 \
+            if len(inspect.signature(self._user_callback).parameters) == 3 \
             else self._user_callback(server, resource, scope, scheme)
 
     def __call__(self, request):