diff --git a/python/ray/tests/BUILD b/python/ray/tests/BUILD
index 6dc95fa4c..9a1132769 100644
--- a/python/ray/tests/BUILD
+++ b/python/ray/tests/BUILD
@@ -468,8 +468,7 @@ py_test(
     name = "test_gcs_fault_tolerance",
     size = "medium",
     srcs = SRCS + ["test_gcs_fault_tolerance.py"],
-    # TODO(swang): Enable again once pubsub client supports GCS server restart.
-    tags = ["exclusive", "manual"],
+    tags = ["exclusive"],
     deps = ["//:ray_lib"],
 )
 
diff --git a/python/ray/tests/test_gcs_fault_tolerance.py b/python/ray/tests/test_gcs_fault_tolerance.py
index ab6ed0509..71ea68a93 100644
--- a/python/ray/tests/test_gcs_fault_tolerance.py
+++ b/python/ray/tests/test_gcs_fault_tolerance.py
@@ -1,3 +1,4 @@
+import os
 import sys
 
 import ray
@@ -20,6 +21,9 @@ def increase(x):
     return x + 1
 
 
+@pytest.mark.skipif(
+    os.environ.get("RAY_GCS_ACTOR_SERVICE_ENABLED") != "true",
+    reason=("This testcase can only be run when GCS actor management is on."))
 def test_gcs_server_restart(ray_start_regular):
     actor1 = Increase.remote()
     result = ray.get(actor1.method.remote(1))
@@ -39,6 +43,9 @@ def test_gcs_server_restart(ray_start_regular):
     assert result == 2
 
 
+@pytest.mark.skipif(
+    os.environ.get("RAY_GCS_ACTOR_SERVICE_ENABLED") != "true",
+    reason=("This testcase can only be run when GCS actor management is on."))
 def test_gcs_server_restart_during_actor_creation(ray_start_regular):
     ids = []
     for i in range(0, 100):
@@ -54,6 +61,9 @@ def test_gcs_server_restart_during_actor_creation(ray_start_regular):
     assert len(unready) == 0
 
 
+@pytest.mark.skipif(
+    os.environ.get("RAY_GCS_ACTOR_SERVICE_ENABLED") != "true",
+    reason=("This testcase can only be run when GCS actor management is on."))
 @pytest.mark.parametrize(
     "ray_start_cluster_head",
     [generate_internal_config_map(num_heartbeats_timeout=20)],