diff --git a/python/ray/tests/modin/BUILD b/python/ray/tests/modin/BUILD
index 406cd5c91..3f2aa0c51 100644
--- a/python/ray/tests/modin/BUILD
+++ b/python/ray/tests/modin/BUILD
@@ -1,6 +1,6 @@
 py_test(
  name = "test_modin",
- size = "small",
+ size = "large",
  srcs = ["test_modin.py"],
  deps = ["//:ray_lib"],
  tags = ["team:core", "exclusive"],
diff --git a/python/ray/tests/modin/test_modin.py b/python/ray/tests/modin/test_modin.py
index 98265f04b..9b1ce3334 100644
--- a/python/ray/tests/modin/test_modin.py
+++ b/python/ray/tests/modin/test_modin.py
@@ -22,7 +22,7 @@ import pandas
 import numpy as np
 from numpy.testing import assert_array_equal
 import ray
-from ray.util.client.ray_client_helpers import ray_start_client_server
+from ray.tests.conftest import start_cluster  # noqa F401
 
 modin_compatible_version = sys.version_info >= (3, 7, 0)
 modin_installed = True
@@ -45,16 +45,10 @@ if not skip:
 
 # Module scoped fixture. Will first run all tests without ray
 # client, then rerun all tests with a single ray client session.
-@pytest.fixture(params=[False, True], autouse=True, scope="module")
-def run_ray_client(request):
-    if request.param:
-        with ray_start_client_server() as client:
-            yield client
-    else:
-        # Run without ray client (do nothing)
-        yield
-        # Cleanup state before rerunning tests with client
-        ray.shutdown()
+@pytest.fixture(autouse=True)
+def run_ray_client(start_cluster):  # noqa F811
+    ray.init(start_cluster[1])
+    yield
 
 
 random_state = np.random.RandomState(seed=42)