diff --git a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
index 4f3a07a..b5cc383 100644
--- a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
+++ b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
@@ -21,6 +21,7 @@
 Library   Process
 
 Resource   ../lib/advanced_cluster_mgmt_lib.resource
+Resource   ../lib/vim_lib.resource
 
 Test Tags   gitops_02   cluster_gitops
 
@@ -54,6 +55,12 @@
 
 
 *** Test Cases ***
+Create Dummy VIM For The Testsuite
+    [Documentation]   Create dummy VIM for the testsuite.
+    [Tags]   vim   cluster   create
+    ${vim_id}=   Create VIM Target   gitops_02_vim   u   p   http://localhost/dummy   t   dummy
+    Set Suite Variable   ${VIM_ID}   ${vim_id}
+
 Add OKA Packages For The Testsuite
     [Documentation]   Add OKA packages for the testsuite.
     [Tags]   oka   create
@@ -64,7 +71,7 @@
 Register Cluster For Testsuite
     [Documentation]   Register K8s cluster for the testsuite.
     [Tags]   cluster   create
-    ${id}=   Register Cluster   ${CLUSTER_NAME}   %{VIM_TARGET}   %{CLUSTER_KUBECONFIG_CREDENTIALS}   ${CLUSTER_DESCRIPTION}
+    ${id}=   Register Cluster   ${CLUSTER_NAME}   ${VIM_ID}   %{CLUSTER_KUBECONFIG_CREDENTIALS}   ${CLUSTER_DESCRIPTION}
     Set Suite Variable   ${CLUSTER_ID}   ${id}
     Log   ${CLUSTER_ID}
 
@@ -132,6 +139,11 @@
     [Tags]   cleanup   cluster
     Deregister Cluster   ${CLUSTER_NAME}
 
+Delete Dummy VIM For The Testsuite
+    [Documentation]   Delete dummy VIM for the testsuite.
+    [Tags]   vim   cluster   cleanup
+    Delete VIM Target   gitops_02_vim
+
 Delete OKA Packages For The Testsuite
     [Documentation]   Delete OKA packages for the testsuite.
     [Tags]   cleanup   oka