diff --git a/tests/test_config.py b/tests/test_config.py
index 3647f972..ebc8d683 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -42,12 +42,16 @@ class MockUname:
         def system(self):
             return 'TestOS'
 
+    # Clear all environment variables and cached CICD provider.
+    for k in os.environ:
+        monkeypatch.delenv(k, raising=False)
+    useragent._cicd_provider = None
+
     monkeypatch.setattr(platform, 'python_version', lambda: '3.0.0')
     monkeypatch.setattr(platform, 'uname', MockUname)
     monkeypatch.setenv('DATABRICKS_SDK_UPSTREAM', "upstream-product")
     monkeypatch.setenv('DATABRICKS_SDK_UPSTREAM_VERSION', "0.0.1")
     monkeypatch.setenv('DATABRICKS_RUNTIME_VERSION', "13.1 anything/else")
-    monkeypatch.delenv('GITHUB_ACTIONS', raising=False)
 
     config = Config(host='http://localhost', username="something", password="something", product='test',
                     product_version='0.0.0') \
diff --git a/tests/test_core.py b/tests/test_core.py
index bbf6ab08..32431172 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from databricks.sdk import WorkspaceClient, errors
+from databricks.sdk import WorkspaceClient, errors, useragent
 from databricks.sdk.core import ApiClient, Config, DatabricksError
 from databricks.sdk.credentials_provider import (CliTokenSource,
                                                  CredentialsProvider,
@@ -178,12 +178,16 @@ class MockUname:
         def system(self):
             return 'TestOS'
 
+    # Clear all environment variables and cached CICD provider.
+    for k in os.environ:
+        monkeypatch.delenv(k, raising=False)
+    useragent._cicd_provider = None
+
     monkeypatch.setattr(platform, 'python_version', lambda: '3.0.0')
     monkeypatch.setattr(platform, 'uname', MockUname)
     monkeypatch.setenv('DATABRICKS_SDK_UPSTREAM', "upstream-product")
     monkeypatch.setenv('DATABRICKS_SDK_UPSTREAM_VERSION', "0.0.1")
     monkeypatch.setenv('DATABRICKS_RUNTIME_VERSION', "13.1 anything/else")
-    monkeypatch.delenv('GITHUB_ACTIONS', raising=False)
 
     config = Config(host='http://localhost', username="something", password="something", product='test',
                     product_version='0.0.0') \