diff --git a/tests/common.py b/tests/common.py
index <HASH>..<HASH> 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -94,9 +94,6 @@ class EWSTest(TimedTestCase):
             # Allow unverified TLS if requested in settings file
             BaseProtocol.HTTP_ADAPTER_CLS = NoVerifyHTTPAdapter
 
-        # Speed up tests a bit. We don't need to wait 10 seconds for every nonexisting server in the discover dance
-        AutodiscoverProtocol.TIMEOUT = 2
-
         # Create an account shared by all tests
         tz = EWSTimeZone.timezone('Europe/Copenhagen')
         cls.retry_policy = FaultTolerance(max_wait=600)
diff --git a/tests/test_autodiscover_legacy.py b/tests/test_autodiscover_legacy.py
index <HASH>..<HASH> 100644
--- a/tests/test_autodiscover_legacy.py
+++ b/tests/test_autodiscover_legacy.py
@@ -22,7 +22,7 @@ class AutodiscoverLegacyTest(EWSTest):
     @classmethod
     def setUpClass(cls):
         super(AutodiscoverLegacyTest, cls).setUpClass()
-        AutodiscoverProtocol.INITIAL_RETRY_POLICY = FaultTolerance(max_wait=30)
+        exchangelib.autodiscover.legacy.INITIAL_RETRY_POLICY = FaultTolerance(max_wait=30)
 
     def test_magic(self):
         # Just test we don't fail
Tweak test settings for stability. Fix for moved INITIAL_RETRY_POLICY