diff --git a/2.5/test/run-openshift-remote-cluster b/2.5/test/run-openshift-remote-cluster
deleted file mode 120000
index 1bffcba8..00000000
--- a/2.5/test/run-openshift-remote-cluster
+++ /dev/null
@@ -1 +0,0 @@
-../../test/run-openshift-remote-cluster
\ No newline at end of file
diff --git a/2.5/test/test-lib-ruby.sh b/2.5/test/test-lib-ruby.sh
deleted file mode 120000
index ea235094..00000000
--- a/2.5/test/test-lib-ruby.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test-lib-ruby.sh
\ No newline at end of file
diff --git a/3.0/test/run-openshift-remote-cluster b/3.0/test/run-openshift-remote-cluster
deleted file mode 120000
index 1bffcba8..00000000
--- a/3.0/test/run-openshift-remote-cluster
+++ /dev/null
@@ -1 +0,0 @@
-../../test/run-openshift-remote-cluster
\ No newline at end of file
diff --git a/3.0/test/test-lib-ruby.sh b/3.0/test/test-lib-ruby.sh
deleted file mode 120000
index ea235094..00000000
--- a/3.0/test/test-lib-ruby.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test-lib-ruby.sh
\ No newline at end of file
diff --git a/3.3/test/run-openshift-remote-cluster b/3.3/test/run-openshift-remote-cluster
deleted file mode 120000
index 1bffcba8..00000000
--- a/3.3/test/run-openshift-remote-cluster
+++ /dev/null
@@ -1 +0,0 @@
-../../test/run-openshift-remote-cluster
\ No newline at end of file
diff --git a/3.3/test/test-lib-ruby.sh b/3.3/test/test-lib-ruby.sh
deleted file mode 120000
index ea235094..00000000
--- a/3.3/test/test-lib-ruby.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test-lib-ruby.sh
\ No newline at end of file
diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest
index 7ee86b6f..32b928b6 100755
--- a/test/run-openshift-pytest
+++ b/test/run-openshift-pytest
@@ -8,4 +8,10 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA  --showlocals -vv test_ocp_*.py
+if python3 -c 'import sys; sys.exit(0 if sys.version_info < (3,13) else 1)'; then
+  PYTHON_VERSION="3.12"
+else
+  PYTHON_VERSION="3"
+fi
+
+cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA  --showlocals -vv test_ocp_*.py
diff --git a/test/run-pytest b/test/run-pytest
index 4615ea5a..3757d742 100755
--- a/test/run-pytest
+++ b/test/run-pytest
@@ -8,8 +8,9 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-PYTHON_VERSION="3.12"
-if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then
-  PYTHON_VERSION="3.13"
+if python3 -c 'import sys; sys.exit(0 if sys.version_info < (3,13) else 1)'; then
+  PYTHON_VERSION="3.12"
+else
+  PYTHON_VERSION="3"
 fi
 cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA --showlocals -vv test_container_*.py