diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py
index 6f16955c5b3a..abb0d27f273d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py
@@ -22,8 +22,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) MULTI_CATEGORY_CLASSIFY_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py
index 6a3fd4834fc4..da57f627aa5a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py
@@ -21,8 +21,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) CUSTOM_ENTITIES_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) CUSTOM_ENTITIES_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py
index cab23b4daa68..74d465a60d52 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py
@@ -22,8 +22,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py
index 5c2aafcce8f0..a6659180e06d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py
@@ -22,8 +22,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) MULTI_CATEGORY_CLASSIFY_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py
index f6477f9c7ae8..feea20e257ab 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py
@@ -21,8 +21,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) CUSTOM_ENTITIES_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) CUSTOM_ENTITIES_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py
index 006be43166a8..4458eb751632 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py
+++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py
@@ -22,8 +22,8 @@
     Set the environment variables with your own values before running the sample:
     1) AZURE_TEXT_ANALYTICS_ENDPOINT - the endpoint to your Cognitive Services resource.
     2) AZURE_TEXT_ANALYTICS_KEY - your Text Analytics subscription key
-    3) AZURE_TEXT_ANALYTICS_PROJECT_NAME - your Text Analytics Language Studio project name
-    4) AZURE_TEXT_ANALYTICS_DEPLOYMENT_NAME - your Text Analytics deployed model name
+    3) SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME - your Text Analytics Language Studio project name
+    4) SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME - your Text Analytics deployed model name
 """
 
 
diff --git a/sdk/textanalytics/test-resources.json b/sdk/textanalytics/test-resources.json
index f94060cd61e8..3f7279172b1c 100644
--- a/sdk/textanalytics/test-resources.json
+++ b/sdk/textanalytics/test-resources.json
@@ -101,14 +101,6 @@
         "TEXTANALYTICS_TEST_ENDPOINT": {
             "type": "string",
             "value": "[variables('azureTextAnalyticsUrl')]"
-        },
-        "AZURE_TEXT_ANALYTICS_KEY": {
-            "type": "string",
-            "value": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', variables('textAnalyticsBaseName')), variables('cognitiveApiVersion')).key1]"
-        },
-        "AZURE_TEXT_ANALYTICS_ENDPOINT": {
-            "type": "string",
-            "value": "[variables('azureTextAnalyticsUrl')]"
         }
     }
 }
diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
index 4c69468b5f4e..7f2287fd3323 100644
--- a/sdk/textanalytics/tests.yml
+++ b/sdk/textanalytics/tests.yml
@@ -13,14 +13,24 @@ stages:
         AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
         AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
         AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        TEXTANALYTICS_CUSTOM_TEXT_ENDPOINT: $(azure-text-analytics-custom-text-endpoint)
-        TEXTANALYTICS_CUSTOM_TEXT_KEY: $(azure-text-analytics-custom-text-key)
-        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME: $(azure-text-analytics-single-category-classify-project-name)
-        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(azure-text-analytics-single-category-classify-deployment-name)
-        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_PROJECT_NAME: $(azure-text-analytics-multi-category-classify-project-name)
-        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(azure-text-analytics-multi-category-classify-deployment-name)
-        TEXTANALYTICS_CUSTOM_ENTITIES_PROJECT_NAME: $(azure-text-analytics-custom-entities-project-name)
-        TEXTANALYTICS_CUSTOM_ENTITIES_DEPLOYMENT_NAME: $(azure-text-analytics-custom-entities-deployment-name)
+        # temporary env vars for custom text features
+        TEXTANALYTICS_CUSTOM_TEXT_ENDPOINT: $(js-textanalytics-test-service-endpoint)
+        TEXTANALYTICS_CUSTOM_TEXT_KEY: $(js-textanalytics-api-key-new)
+        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-single-category-classify-project-name)
+        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-single-category-classify-deployment-name)
+        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-multi-category-classify-project-name)
+        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-multi-category-classify-deployment-name)
+        TEXTANALYTICS_CUSTOM_ENTITIES_PROJECT_NAME: $(js-recognize-custom-entities-project-name)
+        TEXTANALYTICS_CUSTOM_ENTITIES_DEPLOYMENT_NAME: $(js-recognize-custom-entities-deployment-name)
+        # temporary env vars for custom text samples
+        AZURE_TEXT_ANALYTICS_ENDPOINT: $(js-textanalytics-test-service-endpoint)
+        AZURE_TEXT_ANALYTICS_KEY: $(js-textanalytics-api-key-new)
+        SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-single-category-classify-project-name)
+        SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-single-category-classify-deployment-name)
+        MULTI_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-multi-category-classify-project-name)
+        MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-multi-category-classify-deployment-name)
+        CUSTOM_ENTITIES_PROJECT_NAME: $(js-recognize-custom-entities-project-name)
+        CUSTOM_ENTITIES_DEPLOYMENT_NAME: $(js-recognize-custom-entities-deployment-name)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'