diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
index bd45657d0c..3ce2db7989 100644
--- a/tests/integration_tests/conftest.py
+++ b/tests/integration_tests/conftest.py
@@ -3,6 +3,7 @@
 import pytest
 from azure.identity import AzureCliCredential
 from azure.keyvault.secrets import SecretClient
+from pydantic.alias_generators import to_snake
 
 
 VAULT_NAME = os.environ.get("VAULT_NAME")
@@ -17,12 +18,52 @@ def secret_client() -> SecretClient:
 
 
 @pytest.fixture(scope="module")
-def dotenv_template_params(secret_client: SecretClient) -> dict[str, str]:
+def dotenv_template_params_from_kv(secret_client: SecretClient) -> dict[str, str]:
     secrets_properties_list = secret_client.list_properties_of_secrets()
     secrets = {}
     for secret in secrets_properties_list:
-        secrets[secret.name] = secret_client.get_secret(secret.name).value
-        
+        secret_name = to_snake(secret.name).upper()
+        secrets[secret_name] = secret_client.get_secret(secret.name).value
+
     return secrets
 
 
+@pytest.fixture(scope="module")
+def dotenv_template_params_from_env() -> dict[str, str]:
+    def get_and_unset_variable(var_name):
+        # we need this function to ensure that the environment is clean before
+        # testing with generated dotenv files.
+        var_value = os.getenv(var_name)
+        os.environ[var_name] = ""
+        return var_value
+        
+    env_secrets = [
+        "AZURE_COSMOSDB_ACCOUNT",
+        "AZURE_COSMOSDB_ACCOUNT_KEY",
+        "AZURE_COSMOSDB_CONVERSATIONS_CONTAINER",
+        "AZURE_COSMOSDB_DATABASE",
+        "AZURE_OPENAI_EMBEDDING_NAME"
+        "AZURE_OPENAI_ENDPOINT",
+        "AZURE_OPENAI_MODEL",
+        "AZURE_OPENAI_KEY",
+        "AZURE_SEARCH_INDEX",
+        "AZURE_SEARCH_KEY",
+        "AZURE_SEARCH_QUERY",
+        "AZURE_SEARCH_SERVICE",
+        "ELASTICSEARCH_EMBEDDING_MODEL_ID",
+        "ELASTICSEARCH_ENCODED_API_KEY",
+        "ELASTICSEARCH_ENDPOINT",
+        "ELASTICSEARCH_INDEX",
+        "ELASTICSEARCH_QUERY"
+    ]
+    
+    return {s: get_and_unset_variable(s) for s in env_secrets}
+
+
+@pytest.fixture(scope="module")
+def dotenv_template_params(request, use_keyvault_secrets):
+    if use_keyvault_secrets:
+        return request.getfixturevalue("dotenv_template_params_from_kv")
+    
+    return request.getfixturevalue("dotenv_template_params_from_env")
+