diff --git a/ci/run_pytests.sh b/ci/run_pytests.sh
index 6c3f65a1..de3986d1 100755
--- a/ci/run_pytests.sh
+++ b/ci/run_pytests.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
+# Copyright (c) 2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
-# Test with TCP/Sockets
 # Support invoking run_pytests.sh outside the script directory
-cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../tests/
-timeout 10m python -m pytest --cache-clear -vs  "$@" .
+cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
 
-# Support invoking run_pytests.sh outside the script directory
-cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ucp/
-timeout 2m python -m pytest --cache-clear -vs  "$@" ./_libs/tests
+# Test with TCP/Sockets
+timeout 10m pytest --cache-clear -vs  "$@" tests
+timeout 2m pytest --cache-clear -vs  "$@" ucp/_libs/tests
diff --git a/ci/test_python.sh b/ci/test_python.sh
index adcea899..0e20a427 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
+# Copyright (c) 2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
+# Support invoking test_python.sh outside the script directory
+  "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
@@ -36,8 +40,7 @@ run_tests() {
 
   # Test with TCP/Sockets
   rapids-logger "TEST WITH TCP ONLY"
-  # Support invoking test_python.sh outside the script directory
-  "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/run_pytests.sh
+  ./run_pytests.sh
 
   rapids-logger "Run local benchmark"
   # cd to root directory to prevent repo's `ucp` directory from being used
diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh
index d8b6c09d..513bdb71 100755
--- a/ci/test_wheel.sh
+++ b/ci/test_wheel.sh
@@ -10,5 +10,7 @@ RAPIDS_PY_WHEEL_NAME="ucx_py_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-fr
 # echo to expand wildcard before adding `[extra]` requires for pip
 python -m pip install $(echo ./dist/ucx_py*.whl)[test]
 
-# Support invoking test_wheel.sh outside the script directory
-"$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/run_pytests.sh
+cd tests
+python -m pytest --cache-clear -vs .
+cd ../ucp
+python -m pytest --cache-clear -vs ./_libs/tests/