diff --git a/build.gradle b/build.gradle
index 96701cd54..452a1442a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,8 +36,8 @@ runIdeForUiTests {
 }
 
 dependencies {
-    compile 'io.fabric8:openshift-client:5.0.2'
-    compile 'io.fabric8:tekton-client:5.0.2'
+    compile 'io.fabric8:openshift-client:5.7.2'
+    compile 'io.fabric8:tekton-client:5.7.2'
     compile 'com.redhat.devtools.intellij:intellij-common:1.2.3-SNAPSHOT'
     compile 'com.redhat.devtools.alizer:alizer-api:0.1.0-SNAPSHOT'
     testCompile 'org.mockito:mockito-inline:3.8.0'
diff --git a/src/it/java/com/redhat/devtools/intellij/tektoncd/tkn/TknCliPipelineTest.java b/src/it/java/com/redhat/devtools/intellij/tektoncd/tkn/TknCliPipelineTest.java
index 49eb112f3..644754d98 100644
--- a/src/it/java/com/redhat/devtools/intellij/tektoncd/tkn/TknCliPipelineTest.java
+++ b/src/it/java/com/redhat/devtools/intellij/tektoncd/tkn/TknCliPipelineTest.java
@@ -81,7 +81,7 @@ public void verifyCreatePipelineAndPipelineRunAndDeleteAll() throws IOException,
         List<String> pipelines = tkn.getPipelines(NAMESPACE).stream().map(pp -> pp.getMetadata().getName()).collect(Collectors.toList());;
         assertTrue(pipelines.contains(PIPELINE_NAME));
         // verify pipelinerun has been created
-        tkn.getClient(TektonClient.class).v1beta1().pipelineRuns().inNamespace(NAMESPACE)
+        tkn.getClient(TektonClient.class).v1beta1().pipelineRuns().inNamespace(NAMESPACE).withName(PIPELINE_NAME)
                 .waitUntilCondition(pipelineRun -> pipelineRun.getMetadata().getName() != null && pipelineRun.getMetadata().getName().equals(PIPELINE_RUN_NAME), 10, TimeUnit.MINUTES);
         tkn.cancelPipelineRun(NAMESPACE, PIPELINE_RUN_NAME);
         // clean up and verify cleaning succeed
@@ -93,7 +93,7 @@ public void verifyCreatePipelineAndPipelineRunAndDeleteAll() throws IOException,
     }
 
     @Test
-    public void verifyStartPipelineCreateRuns() throws IOException, InterruptedException {
+    public void verifyStartPipelineCreateRuns() throws IOException {
         String TASK_NAME = "add-task";
         String PIPELINE_NAME = "sum-three-pipeline";
         String taskConfig = TestUtils.load("start/add-task.yaml");
@@ -113,9 +113,9 @@ public void verifyStartPipelineCreateRuns() throws IOException, InterruptedExcep
         params.put("second", new Input("name2", "string", Input.Kind.PARAMETER, "value2", Optional.empty(), Optional.empty()));
         params.put("third", new Input("name3", "string", Input.Kind.PARAMETER, "value3", Optional.empty(), Optional.empty()));
         tkn.startPipeline(NAMESPACE, PIPELINE_NAME, params, Collections.emptyMap(), "", Collections.emptyMap(), Collections.emptyMap(), "");
-        io.fabric8.tekton.pipeline.v1beta1.PipelineRun pRun = tkn.getClient(TektonClient.class).v1beta1().pipelineRuns().inNamespace(NAMESPACE)
+        io.fabric8.tekton.pipeline.v1beta1.PipelineRun pRun = tkn.getClient(TektonClient.class).v1beta1().pipelineRuns().inNamespace(NAMESPACE).withName(PIPELINE_NAME)
                 .waitUntilCondition(pipelineRun -> pipelineRun.getMetadata().getName() != null && pipelineRun.getMetadata().getName().startsWith(PIPELINE_NAME), 10, TimeUnit.MINUTES);
-        tkn.getClient(TektonClient.class).v1beta1().taskRuns().inNamespace(NAMESPACE)
+        tkn.getClient(TektonClient.class).v1beta1().taskRuns().inNamespace(NAMESPACE).withName(PIPELINE_NAME)
                 .waitUntilCondition(taskRun -> taskRun.getMetadata().getName() != null && taskRun.getMetadata().getName().startsWith(PIPELINE_NAME), 10, TimeUnit.MINUTES);
         tkn.cancelPipelineRun(NAMESPACE, pRun.getMetadata().getName());
         // clean up