diff --git a/robot-systest/lib/k8scluster_lib.resource b/robot-systest/lib/k8scluster_lib.resource
index 0895da7dd4e10ca9afd80afc84d9653ebae27a5e..dc94046cd6c3313cb1bfd04fb05b555f47fad57c 100644
--- a/robot-systest/lib/k8scluster_lib.resource
+++ b/robot-systest/lib/k8scluster_lib.resource
@@ -35,7 +35,6 @@ Create K8s Cluster
     Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
     Wait Until Keyword Succeeds   ${K8SCLUSTER_LAUNCH_MAX_WAIT_TIME}   ${K8SCLUSTER_LAUNCH_POL_TIME}   Check For K8s Cluster To Be Ready   ${k8scluster_name}
-    Check For K8s Cluster To Be Enabled   ${k8scluster_name}
     RETURN   ${stdout}
 
 Delete K8s Cluster
diff --git a/robot-systest/testsuite/basic_22-cross_model_relations.robot b/robot-systest/testsuite/basic_22-cross_model_relations.robot
index c19f16df78ba1f3bd56a431264b87f36f74834b2..625278d665b0778e265d5e336286eb3051f0693d 100644
--- a/robot-systest/testsuite/basic_22-cross_model_relations.robot
+++ b/robot-systest/testsuite/basic_22-cross_model_relations.robot
@@ -70,6 +70,7 @@ Create Charm NS Descriptor
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Enabled   ${K8SCLUSTER_NAME}
 
 Instantiate Charm Network Service
     [Documentation]   Instantiate NS for the testsuite.
diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index cb86e3775ad9b8b429bf60af7402a6724fd85846..3e4c7417c79aa9fb0fbb7676dbbe02bc094c47c2 100644
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -50,6 +50,7 @@ Create VIM Target Basic
 Add K8s Cluster To OSM
     [Documentation]   Creates a VIM for the K8s cluster to be anchored against
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   ${VIM_NAME}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Remove K8s Cluster from OSM
     [Documentation]   Delete K8s cluster.
diff --git a/robot-systest/testsuite/k8s_07-dummy_helm.robot b/robot-systest/testsuite/k8s_07-dummy_helm.robot
index 59c73ba5095ad64b33c5132b8553831d1e27813a..37168963850d994e5fafea3be7f8bdd4cf676d00 100644
--- a/robot-systest/testsuite/k8s_07-dummy_helm.robot
+++ b/robot-systest/testsuite/k8s_07-dummy_helm.robot
@@ -78,6 +78,7 @@ Create Dummy VIM
 Add K8s Cluster To OSM
     [Documentation]   Register a K8s cluster associated to the dummy VIM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   ${VIM_NAME}   ${K8SCLUSTER_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.
diff --git a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
index 14cda797b4f8892c92fee8491a80bc1375d9b6f8..f818a0466168151ea68c4ae854a16146d139576d 100644
--- a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
@@ -73,6 +73,7 @@ Create Simple K8s Scale NS Descriptor
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.
diff --git a/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
index fdf2f25dcf7230ac593935a9cf0da554021bb457..7bdb39ca2cefa262e0e2ff63aeba7d5c25ccc8c1 100644
--- a/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
+++ b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
@@ -72,6 +72,7 @@ Create Package For OpenLDAP NS
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Enabled   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.