diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
index 947a2993a58e..56b674053784 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
@@ -87,25 +87,11 @@ tests:
     - as: e2e-hypershift-pao
       cli: latest
       commands: |-
-        # CLI_DIR
-        # SHARED_DIR
-        # CLUSTER_TYPE=hypershift
         export CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)"
-        echo CLUSTER_NAME ${CLUSTER_NAME}
-
         export HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
-        echo  HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG
-        cat ${HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG}
-
         export HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE="$(${CLI_DIR}/oc get hcp -A -o=jsonpath="{.items[?(@.metadata.name==\"$CLUSTER_NAME\")].metadata.namespace}")"
-        echo HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE ${HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE}
-
-        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
-        echo KUBECONFIG
-        cat ${KUBECONFIG}
-
-        make cluster-label-worker-cnf test-unit
-        sleep 3600
+        export HYPERSHIFT_HOSTED_CLUSTER_KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
+        make pao-functests-hypershift
       from: src
       resources:
         requests: