diff --git a/python/orca/dev/test/run-pytests-horovod-tf.sh b/python/orca/dev/test/run-pytests-horovod-tf.sh
index 60615fa2694..f34902fda72 100755
--- a/python/orca/dev/test/run-pytests-horovod-tf.sh
+++ b/python/orca/dev/test/run-pytests-horovod-tf.sh
@@ -26,7 +26,7 @@ ray stop -f
 cd ../../
 echo "Running RayOnSpark tests"
 python -m pytest -v test/bigdl/orca/learn/ray/tf/ \
-    --ignore=test/bigdl/orca/learn/ray/tf/test_ray_tf2estimator.py \
+    --ignore=test/bigdl/orca/learn/ray/tf/test_tf2estimator_ray_runtime.py \
     --ignore=test/bigdl/orca/learn/ray/tf/test_tf2estimator_ray_dataset.py \
     --ignore=test/bigdl/orca/learn/ray/tf/test_tf2estimator_tf2_backend.py
 python -m pytest -v test/bigdl/orca/data/test_read_parquet_images.py
diff --git a/python/orca/dev/test/run-pytests-ray b/python/orca/dev/test/run-pytests-ray
index 67d8bd9be31..be89955012f 100755
--- a/python/orca/dev/test/run-pytests-ray
+++ b/python/orca/dev/test/run-pytests-ray
@@ -43,7 +43,7 @@ ray stop -f
 echo "Running orca learn ray tests"
 python -m pytest -v test/bigdl/orca/learn/ray \
       --ignore=test/bigdl/orca/learn/ray/pytorch/test_estimator_horovod_backend.py \
-      --ignore=test/bigdl/orca/learn/ray/pytorch/test_ray_pytorch_estimator.py \
+      --ignore=test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_runtime.py \
       --ignore=test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_dataset.py \
       --ignore=test/bigdl/orca/learn/ray/tf/
 exit_status_2=$?
diff --git a/python/orca/dev/test/run-pytests-ray-ctx.sh b/python/orca/dev/test/run-pytests-ray-ctx.sh
index 900823c1981..7374d2eebc6 100644
--- a/python/orca/dev/test/run-pytests-ray-ctx.sh
+++ b/python/orca/dev/test/run-pytests-ray-ctx.sh
@@ -42,14 +42,14 @@ ray stop -f
 ray start --head
 
 echo "Running Ray Estimator tests"
-python -m pytest -v test/bigdl/orca/learn/ray/pytorch/test_ray_pytorch_estimator.py
+python -m pytest -v test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_runtime.py
 exit_status_2=$?
 if [ $exit_status_2 -ne 0 ];
 then
     exit $exit_status_2
 fi
 
-python -m pytest -v test/bigdl/orca/learn/ray/tf/test_ray_tf2estimator.py
+python -m pytest -v test/bigdl/orca/learn/ray/tf/test_tf2estimator_ray_runtime.py
 exit_status_3=$?
 if [ $exit_status_3 -ne 0 ];
 then
diff --git a/python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_pytorch_backend.py b/python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_backend.py
similarity index 100%
rename from python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_pytorch_backend.py
rename to python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_backend.py
diff --git a/python/orca/test/bigdl/orca/learn/ray/pytorch/test_ray_pytorch_estimator.py b/python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_runtime.py
similarity index 100%
rename from python/orca/test/bigdl/orca/learn/ray/pytorch/test_ray_pytorch_estimator.py
rename to python/orca/test/bigdl/orca/learn/ray/pytorch/test_estimator_ray_runtime.py
diff --git a/python/orca/test/bigdl/orca/learn/ray/tf/test_ray_tf2estimator.py b/python/orca/test/bigdl/orca/learn/ray/tf/test_tf2estimator_ray_runtime.py
similarity index 100%
rename from python/orca/test/bigdl/orca/learn/ray/tf/test_ray_tf2estimator.py
rename to python/orca/test/bigdl/orca/learn/ray/tf/test_tf2estimator_ray_runtime.py