diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
index 7a9dbe98..f21f9c5d 100644
--- a/.github/workflows/openshift-tests.yml
+++ b/.github/workflows/openshift-tests.yml
@@ -5,12 +5,12 @@ on:
 jobs:
   openshift-tests:
     # This job only runs for '[test] pull request comments by owner, member
-    name: "RHEL8 tests: imagestream ${{ matrix.version }}"
+    name: "RHEL9 tests: imagestream ${{ matrix.version }}"
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        version: [ "2.5-ubi8", "3.0-ubi8", "3.1-ubi8", "3.0-ubi9", "3.1-ubi9" ]
+        version: [ "2.5-ubi8", "3.1-ubi8", "3.0-ubi9", "3.1-ubi9", "3.3-ubi9", "3.3-ubi9" ]
 
     if: |
       github.event.issue.pull_request
@@ -20,11 +20,11 @@ jobs:
       - uses: sclorg/testing-farm-as-github-action@main
         with:
           api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
-          compose: "RHEL-8.10.0-Nightly"
+          compose: "RHEL-9.4.0-Nightly"
           git_url: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans"
           git_ref: "master"
           tf_scope: "private"
-          tmt_plan_regex: "rhel8-openshift-4"
+          tmt_plan_regex: "rhel9-openshift-pytest"
           update_pull_request_status: true
-          pull_request_status_name: "RHEL8-OpenShift-4 - imagestream test ${{ matrix.version }}"
-          variables: "REPO_URL=${{ github.server_url }}/${{ github.repository }};REPO_NAME=${{ github.repository }};PR_NUMBER=${{ github.event.issue.number }};OS=rhel8;SINGLE_VERSION=${{ matrix.version }};TEST_NAME=test-openshift-4"
+          pull_request_status_name: "RHEL9-OpenShift-4 - imagestream test ${{ matrix.version }}"
+          variables: "REPO_URL=${{ github.server_url }}/${{ github.repository }};REPO_NAME=${{ github.repository }};PR_NUMBER=${{ github.event.issue.number }};OS=rhel9;SINGLE_VERSION=${{ matrix.version }};TEST_NAME=test-openshift-4"
diff --git a/Makefile b/Makefile
index 97a95a66..8b0fbeb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,3 @@
 .PHONY: test-openshift-4
 test-openshift-4:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --verbose --color=yes --showlocals .
\ No newline at end of file
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest -s -rA --showlocals -vv test_.py
\ No newline at end of file