diff --git a/ods_ci/tests/Tests/650__distributed_workloads/test-smoke.robot b/ods_ci/tests/Tests/650__distributed_workloads/test-smoke.robot
index 282481f5b..aef1bfbf9 100644
--- a/ods_ci/tests/Tests/650__distributed_workloads/test-smoke.robot
+++ b/ods_ci/tests/Tests/650__distributed_workloads/test-smoke.robot
@@ -2,10 +2,8 @@
 Documentation     Smoke tests for DistributedWorkloads
 Library           Process
 Resource          ../../../tasks/Resources/RHODS_OLM/install/oc_install.robot
-
-
-*** Variables ***
-${ODH_NAMESPACE}                %{ODH_NAMESPACE=redhat-ods-applications}
+Suite Setup       Prepare Codeflare E2E Test Suite
+Suite Teardown    Teardown Codeflare E2E Test Suite
 
 
 *** Test Cases ***
@@ -14,18 +12,18 @@ Ray smoke test
     [Tags]    Smoke
     ...       DistributedWorkloads
     Log To Console    Waiting for kuberay-operator to be available
-    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=60s -n ${ODH_NAMESPACE} deployment/kuberay-operator
+    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=60s -n ${APPLICATIONS_NAMESPACE} deployment/kuberay-operator
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Timeout waiting for deployment/kuberay-operator to be available in ${ODH_NAMESPACE}
+        FAIL    Timeout waiting for deployment/kuberay-operator to be available in ${APPLICATIONS_NAMESPACE}
     END
     Log To Console    kuberay-operator deployment is available
-    ${result} =    Run Process    oc get service -n ${ODH_NAMESPACE} kuberay-operator
+    ${result} =    Run Process    oc get service -n ${APPLICATIONS_NAMESPACE} kuberay-operator
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Can not find kuberay-operator service in ${ODH_NAMESPACE}
+        FAIL    Can not find kuberay-operator service in ${APPLICATIONS_NAMESPACE}
     END
     Log To Console    kuberay-operator service exists
 
@@ -34,17 +32,17 @@ Codeflare smoke test
     [Tags]    Smoke
     ...       DistributedWorkloads
     Log To Console    Waiting for codeflare-operator-manager to be available
-    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=60s -n ${ODH_NAMESPACE} deployment/codeflare-operator-manager
+    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=60s -n ${APPLICATIONS_NAMESPACE} deployment/codeflare-operator-manager
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Timeout waiting for deployment/codeflare-operator-manager to be available in ${ODH_NAMESPACE}
+        FAIL    Timeout waiting for deployment/codeflare-operator-manager to be available in ${APPLICATIONS_NAMESPACE}
     END
-    ${result} =    Run Process    oc get service -n ${ODH_NAMESPACE} codeflare-operator-manager-metrics
+    ${result} =    Run Process    oc get service -n ${APPLICATIONS_NAMESPACE} codeflare-operator-manager-metrics
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Can not find codeflare-operator-manager-metrics service in ${ODH_NAMESPACE}
+        FAIL    Can not find codeflare-operator-manager-metrics service in ${APPLICATIONS_NAMESPACE}
     END
     Log To Console    codeflare-operator-manager-metrics service exists
 
@@ -52,17 +50,41 @@ Kueue smoke test
     [Documentation]    Check that Kueue deployment and its service are up and running
     [Tags]    Smoke
     ...       DistributedWorkloads
+    ...       qqq
     Log To Console    Waiting for kueue-controller-manager to be available
-    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=300s -n ${ODH_NAMESPACE} deployment/kueue-controller-manager
+    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=300s -n ${APPLICATIONS_NAMESPACE} deployment/kueue-controller-manager
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Timeout waiting for deployment/kueue-controller-manager to be available in ${ODH_NAMESPACE}
+        FAIL    Timeout waiting for deployment/kueue-controller-manager to be available in ${APPLICATIONS_NAMESPACE}
     END
-    ${result} =    Run Process    oc get service -n ${ODH_NAMESPACE} kueue-webhook-service
+    ${result} =    Run Process    oc get service -n ${APPLICATIONS_NAMESPACE} kueue-webhook-service
     ...    shell=true    stderr=STDOUT
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
-        FAIL    Can not find kueue-webhook-service service in ${ODH_NAMESPACE}
+        FAIL    Can not find kueue-webhook-service service in ${APPLICATIONS_NAMESPACE}
     END
     Log To Console    kueue-webhook-service service exists
+
+Training operator smoke test
+    [Documentation]    Check that Training operator deployment is up and running
+    [Tags]    Smoke
+    ...       DistributedWorkloads
+    Log To Console    Waiting for kubeflow-training-operator to be available
+    ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=300s -n ${APPLICATIONS_NAMESPACE} deployment/kubeflow-training-operator
+    ...    shell=true    stderr=STDOUT
+    Log To Console    ${result.stdout}
+    IF    ${result.rc} != 0
+        FAIL    Timeout waiting for deployment/kubeflow-training-operator to be available in ${APPLICATIONS_NAMESPACE}
+    END
+
+
+*** Keywords ***
+Prepare Codeflare E2E Test Suite
+    Enable Component    trainingoperator
+    Wait Component Ready    trainingoperator
+    RHOSi Setup
+
+Teardown Codeflare E2E Test Suite
+    Disable Component    trainingoperator
+    RHOSi Teardown