diff --git a/test_elasticsearch_serverless/test_async/test_server/conftest.py b/test_elasticsearch_serverless/test_async/test_server/conftest.py
index 8199ad2..a97890c 100644
--- a/test_elasticsearch_serverless/test_async/test_server/conftest.py
+++ b/test_elasticsearch_serverless/test_async/test_server/conftest.py
@@ -26,7 +26,7 @@
 
 
 @pytest_asyncio.fixture(scope="function")
-async def async_client(elasticsearch_url, elasticsearch_api_key):
+async def async_client_factory(elasticsearch_url, elasticsearch_api_key):
 
     if not hasattr(elasticsearch_serverless, "AsyncElasticsearch"):
         pytest.skip("test requires 'AsyncElasticsearch' and aiohttp to be installed")
@@ -37,10 +37,18 @@ async def async_client(elasticsearch_url, elasticsearch_api_key):
     client = None
     try:
         client = elasticsearch_serverless.AsyncElasticsearch(
-            elasticsearch_url, api_key=elasticsearch_api_key, request_timeout=3
+            elasticsearch_url, api_key=elasticsearch_api_key
         )
         yield client
     finally:
         if client:
-            wipe_cluster(client, elasticsearch_api_key)
             await client.close()
+
+
+@pytest.fixture(scope="function")
+def async_client(async_client_factory, elasticsearch_api_key):
+    try:
+        yield async_client_factory
+    finally:
+        # Wipe the cluster clean after every test execution.
+        wipe_cluster(async_client_factory, elasticsearch_api_key)
diff --git a/test_elasticsearch_serverless/test_async/test_server/test_rest_api_spec.py b/test_elasticsearch_serverless/test_async/test_server/test_rest_api_spec.py
index c7880b3..2f7b3fd 100644
--- a/test_elasticsearch_serverless/test_async/test_server/test_rest_api_spec.py
+++ b/test_elasticsearch_serverless/test_async/test_server/test_rest_api_spec.py
@@ -241,8 +241,8 @@ async def _feature_enabled(self, name):
 
 
 @pytest_asyncio.fixture(scope="function")
-def async_runner(async_client):
-    return AsyncYamlRunner(async_client)
+def async_runner(async_client_factory):
+    return AsyncYamlRunner(async_client_factory)
 
 
 if RUN_ASYNC_REST_API_TESTS:
diff --git a/test_elasticsearch_serverless/test_server/test_rest_api_spec.py b/test_elasticsearch_serverless/test_server/test_rest_api_spec.py
index 5e1a1a2..9321805 100644
--- a/test_elasticsearch_serverless/test_server/test_rest_api_spec.py
+++ b/test_elasticsearch_serverless/test_server/test_rest_api_spec.py
@@ -504,8 +504,8 @@ def _skip_intentional_type_errors(self, e: Exception):
 
 
 @pytest.fixture(scope="function")
-def sync_runner(sync_client):
-    return YamlRunner(sync_client)
+def sync_runner(sync_client_factory):
+    return YamlRunner(sync_client_factory)
 
 
 # Source: https://stackoverflow.com/a/37958106/5763213