diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md
index 5fb053949d8b..7b3f614f2431 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md
@@ -65,8 +65,7 @@ We continue to support API key and AAD authentication methods when creating the
 Creating new clients in `Azure.AI.FormRecognizer`:
 ```C#
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var credential = new AzureKeyCredential(apiKey);
+var credential = new DefaultAzureCredential();
 
 var documentAnalysisClient = new DocumentAnalysisClient(new Uri(endpoint), credential);
 var documentModelAdministrationClient = new DocumentModelAdministrationClient(new Uri(endpoint), credential);
@@ -75,8 +74,7 @@ var documentModelAdministrationClient = new DocumentModelAdministrationClient(ne
 Creating new clients in `Azure.AI.DocumentIntelligence`:
 ```C# Snippet:Migration_CreateBothDocumentIntelligenceClients
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var credential = new AzureKeyCredential(apiKey);
+var credential = new DefaultAzureCredential();
 
 var documentIntelligenceClient = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 var documentIntelligenceAdministrationClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
@@ -352,7 +350,7 @@ Differences between the versions:
 Building a document model with `Azure.AI.FormRecognizer`:
 ```C#
 Uri blobContainerUri = new Uri("<blobContainerUri>");
-var client = new DocumentModelAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var client = new DocumentModelAdministrationClient(new Uri(endpoint), new DefaultAzureCredential());
 
 BuildDocumentModelOperation operation = await client.BuildDocumentModelAsync(WaitUntil.Completed, blobContainerUri, DocumentBuildMode.Template);
 DocumentModelDetails model = operation.Value;
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md
index c3b3afa841d7..a37e5d5aa240 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md
@@ -97,7 +97,7 @@ az cognitiveservices account keys list --name "<resource-name>" --resource-group
 
 Once you have the value for the API key, create an `AzureKeyCredential`. With the endpoint and key credential, you can create the [`DocumentIntelligenceClient`][doc_intelligence_client_class]:
 
-```C# Snippet:CreateDocumentIntelligenceClient
+```C# Snippet:CreateDocumentIntelligenceClientApiKey
 string endpoint = "<endpoint>";
 string apiKey = "<apiKey>";
 var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
@@ -117,9 +117,10 @@ You will also need to [register a new AAD application][register_aad_app] and [gr
 
 Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET.
 
-```C# Snippet:CreateDocumentIntelligenceClientTokenCredential
+```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential());
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## Key concepts
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json
index a44682a71766..82a37d28ea5c 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/documentintelligence/Azure.AI.DocumentIntelligence",
-  "Tag": "net/documentintelligence/Azure.AI.DocumentIntelligence_76280009cf"
+  "Tag": "net/documentintelligence/Azure.AI.DocumentIntelligence_ac9b1a968f"
 }
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md
index a794fc8daeb8..05821f5b86f3 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md
@@ -14,8 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## High resolution extraction
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md
index 569c0572800a..192bbf5273e4 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## Use a prebuilt model to analyze a document from a URI
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md
index 5d9de4d43513..a902cd6a55f5 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md
@@ -14,8 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceAdministrationClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
 ```
 
 ## Build a custom model
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md
index 662516c84cd6..4486d3a2a3b2 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md
@@ -14,8 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceAdministrationClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
 ```
 
 ## Build a document classifier
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md
index 4622f4127021..6bcf6bfa4c7a 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## Classify a document from a URI
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md
index 1f4f186a5ae0..a09ad62aa5d4 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md
@@ -26,8 +26,8 @@ The source client that contains the custom model to copy.
 
 ```C# Snippet:DocumentIntelligenceSampleCreateCopySourceClient
 string sourceEndpoint = "<sourceEndpoint>";
-string sourceApiKey = "<sourceApiKey>";
-var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new AzureKeyCredential(sourceApiKey));
+var sourceResourceCredential = new DefaultAzureCredential();
+var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), sourceResourceCredential);
 ```
 
 ### Target client
@@ -36,8 +36,8 @@ The target client to copy the custom model to.
 
 ```C# Snippet:DocumentIntelligenceSampleCreateCopyTargetClient
 string targetEndpoint = "<targetEndpoint>";
-string targetApiKey = "<targetApiKey>";
-var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new AzureKeyCredential(targetApiKey));
+var targetResourceCredential = new DefaultAzureCredential();
+var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), targetResourceCredential);
 ```
 
 ### Authorize the copy
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md
index 6c3c32580ee9..2d1b1f5f04d2 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## Extract the layout of a document from a URI
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md
index 727a90dcc29e..0dd816583ebe 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
 ```
 
 ## Extract the layout of a document as Markdown
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md
index de3ee51532b3..4f261237cf1e 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceAdministrationClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
 ```
 
 ## Get and List Document Model Operations
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md
index 26794bb45373..d29f14b500a8 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceAdministrationClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
 ```
 
 ## Model administration operations
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md
index c42f0f450f1b..c3796d2b90cd 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md
@@ -12,8 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur
 
 ```C# Snippet:CreateDocumentIntelligenceAdministrationClient
 string endpoint = "<endpoint>";
-string apiKey = "<apiKey>";
-var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+var credential = new DefaultAzureCredential();
+var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
 ```
 
 ## Compose a model
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs
index e71a0d1ab3b8..0960675610c0 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs
@@ -15,10 +15,9 @@ public DocumentIntelligenceAdministrationClientLiveTests(bool isAsync)
         }
 
         [RecordedTest]
-        [Ignore("https://github.com/Azure/azure-sdk-for-net/issues/40054")]
-        public async Task DocumentIntelligenceAdministrationClientCanAuthenticateWithTokenCredential()
+        public async Task DocumentIntelligenceAdministrationClientCanAuthenticateWithApiKey()
         {
-            var client = CreateDocumentIntelligenceAdministrationClient(useTokenCredential: true);
+            var client = CreateDocumentIntelligenceAdministrationClient(useApiKey: true);
 
             Response<ResourceDetails> response = await client.GetResourceInfoAsync();
             Response rawResponse = response.GetRawResponse();
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs
index 076bd30d577a..06e2824b41f3 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs
@@ -15,10 +15,9 @@ public DocumentIntelligenceClientLiveTests(bool isAsync)
         }
 
         [RecordedTest]
-        [Ignore("https://github.com/Azure/azure-sdk-for-net/issues/40054")]
-        public async Task DocumentIntelligenceClientCanAuthenticateWithTokenCredential()
+        public async Task DocumentIntelligenceClientCanAuthenticateWithApiKey()
         {
-            var client = CreateDocumentIntelligenceClient(useTokenCredential: true);
+            var client = CreateDocumentIntelligenceClient(useApiKey: true);
 
             var content = new AnalyzeDocumentContent()
             {
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs
index 2ba694f3ccaf..5e15593536d3 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs
@@ -21,41 +21,41 @@ public DocumentIntelligenceLiveTestBase(bool isAsync, RecordedTestMode? mode = n
 
         protected string ServiceVersionString { get; } = "2024-07-31-preview";
 
-        protected DocumentIntelligenceClient CreateDocumentIntelligenceClient(bool useTokenCredential = false)
+        protected DocumentIntelligenceClient CreateDocumentIntelligenceClient(bool useApiKey = false)
         {
             var endpoint = new Uri(TestEnvironment.Endpoint);
             var options = InstrumentClientOptions(new DocumentIntelligenceClientOptions());
 
             DocumentIntelligenceClient nonInstrumentedClient;
 
-            if (useTokenCredential)
+            if (useApiKey)
             {
-                nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, TestEnvironment.Credential, options);
+                var credential = new AzureKeyCredential(TestEnvironment.ApiKey);
+                nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, credential, options);
             }
             else
             {
-                var credential = new AzureKeyCredential(TestEnvironment.ApiKey);
-                nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, credential, options);
+                nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, TestEnvironment.Credential, options);
             }
 
             return InstrumentClient(nonInstrumentedClient);
         }
 
-        protected DocumentIntelligenceAdministrationClient CreateDocumentIntelligenceAdministrationClient(bool useTokenCredential = false)
+        protected DocumentIntelligenceAdministrationClient CreateDocumentIntelligenceAdministrationClient(bool useApiKey = false)
         {
             var endpoint = new Uri(TestEnvironment.Endpoint);
             var options = InstrumentClientOptions(new DocumentIntelligenceClientOptions());
 
             DocumentIntelligenceAdministrationClient nonInstrumentedClient;
 
-            if (useTokenCredential)
+            if (useApiKey)
             {
-                nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, TestEnvironment.Credential, options);
+                var credential = new AzureKeyCredential(TestEnvironment.ApiKey);
+                nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, credential, options);
             }
             else
             {
-                var credential = new AzureKeyCredential(TestEnvironment.ApiKey);
-                nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, credential, options);
+                nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, TestEnvironment.Credential, options);
             }
 
             return InstrumentClient(nonInstrumentedClient);
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs
index 43ccbde453d6..88872f260da7 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs
@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
+using Azure.Identity;
 
 namespace Azure.AI.DocumentIntelligence.Tests
 {
@@ -56,12 +57,12 @@ public static BinaryData CreateBinaryData(string filename)
         protected override async ValueTask<bool> IsEnvironmentReadyAsync()
         {
             var endpoint = new Uri(Endpoint);
-            var keyCredential = new AzureKeyCredential(ApiKey);
-            var keyCredentialClient = new DocumentIntelligenceAdministrationClient(endpoint, keyCredential);
+            var credential = Credential;
+            var client = new DocumentIntelligenceAdministrationClient(endpoint, credential);
 
             try
             {
-                await keyCredentialClient.GetResourceInfoAsync();
+                await client.GetResourceInfoAsync();
             }
             catch (RequestFailedException e) when (e.Status == 401)
             {
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs
index fdc69eaf66a2..5971d426eba8 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs
@@ -10,7 +10,7 @@ namespace Azure.AI.DocumentIntelligence.Samples
     [AsyncOnly] // Ensure that each sample will only run once.
     public partial class DocumentIntelligenceSamples : RecordedTestBase<DocumentIntelligenceTestEnvironment>
     {
-        public DocumentIntelligenceSamples(bool isAsync) : base(isAsync, RecordedTestMode.Live)
+        public DocumentIntelligenceSamples(bool isAsync) : base(isAsync)
         {
         }
     }
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs
index 9f63f918ca62..15da927b6f89 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs
@@ -16,8 +16,7 @@ public partial class DocumentIntelligenceSamples
         public async Task AnalyzeWithPrebuiltModelWithBase64Async()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelWithBase64Async
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs
index bc30d5782226..d166e87293ed 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs
@@ -18,25 +18,27 @@ public void CreateDocumentIntelligenceClient()
             #region Snippet:CreateDocumentIntelligenceClient
 #if SNIPPET
             string endpoint = "<endpoint>";
-            string apiKey = "<apiKey>";
+            var credential = new DefaultAzureCredential();
 #else
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
+            var credential = TestEnvironment.Credential;
 #endif
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), credential);
             #endregion
         }
 
         [RecordedTest]
-        public void CreateDocumentIntelligenceClientTokenCredential()
+        public void CreateDocumentIntelligenceClientApiKey()
         {
-            #region Snippet:CreateDocumentIntelligenceClientTokenCredential
+            #region Snippet:CreateDocumentIntelligenceClientApiKey
 #if SNIPPET
             string endpoint = "<endpoint>";
+            string apiKey = "<apiKey>";
 #else
             string endpoint = TestEnvironment.Endpoint;
+            string apiKey = TestEnvironment.ApiKey;
 #endif
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential());
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
             #endregion
         }
 
@@ -46,12 +48,12 @@ public void CreateDocumentIntelligenceAdministrationClient()
             #region Snippet:CreateDocumentIntelligenceAdministrationClient
 #if SNIPPET
             string endpoint = "<endpoint>";
-            string apiKey = "<apiKey>";
+            var credential = new DefaultAzureCredential();
 #else
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
+            var credential = TestEnvironment.Credential;
 #endif
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
             #endregion
         }
 
@@ -61,12 +63,11 @@ public void CreateBothDocumentIntelligenceClients()
             #region Snippet:Migration_CreateBothDocumentIntelligenceClients
 #if SNIPPET
             string endpoint = "<endpoint>";
-            string apiKey = "<apiKey>";
+            var credential = new DefaultAzureCredential();
 #else
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
+            var credential = TestEnvironment.Credential;
 #endif
-            var credential = new AzureKeyCredential(apiKey);
 
             var documentIntelligenceClient = new DocumentIntelligenceClient(new Uri(endpoint), credential);
             var documentIntelligenceAdministrationClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential);
@@ -77,8 +78,7 @@ public void CreateBothDocumentIntelligenceClients()
         public async Task BadRequestSnippet()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceBadRequest
             var content = new AnalyzeDocumentContent()
@@ -101,8 +101,7 @@ public async Task BadRequestSnippet()
         public async Task GetWordsSnippet()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:Migration_DocumentIntelligenceGetWordsUsage
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs
index 169bf3f768bc..3dd5cc8ba013 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs
@@ -16,8 +16,7 @@ public partial class DocumentIntelligenceSamples
         public async Task AnalyzeWithFormulaExtraction()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleFormulaExtraction
 #if SNIPPET
@@ -65,8 +64,7 @@ public async Task AnalyzeWithFormulaExtraction()
         public async Task AnalyzeWithFontStyling()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleFontStyling
 #if SNIPPET
@@ -229,8 +227,7 @@ public async Task AnalyzeWithFontStyling()
         public async Task AnalyzeWithBarcodeExtraction()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleBarcodeExtraction
 #if SNIPPET
@@ -280,8 +277,7 @@ public async Task AnalyzeWithBarcodeExtraction()
         public async Task AnalyzeWithLanguageDetection()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleLanguageDetection
 #if SNIPPET
@@ -323,8 +319,7 @@ public async Task AnalyzeWithLanguageDetection()
         public async Task AnalyzeWithKeyValuePairs()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleKeyValuePairsExtraction
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs
index 4b2e7967194d..9c7538a11187 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs
@@ -15,8 +15,7 @@ public partial class DocumentIntelligenceSamples
         public async Task AnalyzeWithPrebuiltModelFromUriAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelFromUriAsync
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs
index c23a1a9b7bb2..1988e301887a 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs
@@ -14,8 +14,7 @@ public partial class DocumentIntelligenceSamples
         public async Task BuildCustomModelAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleBuildModel
             // For this sample, you can use the training documents found in the `trainingFiles` folder.
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs
index a9059699e148..55d793d53563 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs
@@ -14,8 +14,7 @@ public partial class DocumentIntelligenceSamples
         public async Task BuildDocumentClassifierAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleBuildClassifier
             // For this sample, you can use the training documents found in the `classifierTrainingFiles` folder.
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs
index 3cf9d721b59d..77f8e090e5b0 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs
@@ -15,9 +15,8 @@ public partial class DocumentIntelligenceSamples
         public async Task ClassifyDocumentFromUriAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
-            var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
+            var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             string setupClassifierId = Guid.NewGuid().ToString();
             Uri blobContainerUri = new Uri(TestEnvironment.ClassifierTrainingSasUrl);
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs
index 5b62541c4a3d..245798e26acd 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
-using NUnit.Framework;
 
 namespace Azure.AI.DocumentIntelligence.Samples
 {
@@ -15,8 +14,7 @@ public partial class DocumentIntelligenceSamples
         public async Task ComposeModelAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceSampleBuildVariousModels
             // For this sample, you can use the training documents found in the `trainingFiles` folder.
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs
index 2da068c23ad7..eef61ad2e2f3 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
+using Azure.Identity;
 
 namespace Azure.AI.DocumentIntelligence.Samples
 {
@@ -15,12 +16,12 @@ public async Task CopyModelToAsync()
             #region Snippet:DocumentIntelligenceSampleCreateCopySourceClient
 #if SNIPPET
             string sourceEndpoint = "<sourceEndpoint>";
-            string sourceApiKey = "<sourceApiKey>";
+            var sourceResourceCredential = new DefaultAzureCredential();
 #else
             string sourceEndpoint = TestEnvironment.Endpoint;
-            string sourceApiKey = TestEnvironment.ApiKey;
+            var sourceResourceCredential = TestEnvironment.Credential;
 #endif
-            var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new AzureKeyCredential(sourceApiKey));
+            var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), sourceResourceCredential);
             #endregion
 
             // For the purpose of this sample, we are going to create a model to copy. Note that
@@ -38,12 +39,12 @@ public async Task CopyModelToAsync()
             #region Snippet:DocumentIntelligenceSampleCreateCopyTargetClient
 #if SNIPPET
             string targetEndpoint = "<targetEndpoint>";
-            string targetApiKey = "<targetApiKey>";
+            var targetResourceCredential = new DefaultAzureCredential();
 #else
             string targetEndpoint = TestEnvironment.Endpoint;
-            string targetApiKey = TestEnvironment.ApiKey;
+            var targetResourceCredential = TestEnvironment.Credential;
 #endif
-            var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new AzureKeyCredential(targetApiKey));
+            var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), targetResourceCredential);
             #endregion
 
             #region Snippet:DocumentIntelligenceSampleGetCopyAuthorization
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs
index 447538501ea3..d55a20f520d4 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs
@@ -14,8 +14,7 @@ public partial class DocumentIntelligenceSamples
         public async Task ExtractLayoutAsMarkdownAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceExtractLayoutAsMarkdownAsync
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs
index 14296a51c55a..e0f2c50c906e 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs
@@ -15,7 +15,7 @@ public async Task ExtractLayoutFromUriAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
             string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential);
 
             #region Snippet:DocumentIntelligenceExtractLayoutFromUriAsync
 #if SNIPPET
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs
index cb5964474abf..0b70ff07dfb8 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs
@@ -13,8 +13,7 @@ public partial class DocumentIntelligenceSamples
         public async Task GetAndListOperationsAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             // Build a custom model to make sure that there is at least one operation.
             string modelId = Guid.NewGuid().ToString();
diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs
index d4dc678953a8..e5c84bf6d705 100644
--- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs
+++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs
@@ -13,8 +13,7 @@ public partial class DocumentIntelligenceSamples
         public async Task ManageModelsAsync()
         {
             string endpoint = TestEnvironment.Endpoint;
-            string apiKey = TestEnvironment.ApiKey;
-            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
+            var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential);
 
             // Build to make sure that there is at least one custom model.
             string setupModelId = Guid.NewGuid().ToString();