diff --git a/src/main/java/org/kohsuke/github/GHWorkflow.java b/src/main/java/org/kohsuke/github/GHWorkflow.java
index dff9ffdc3d..fce3a0e1dc 100644
--- a/src/main/java/org/kohsuke/github/GHWorkflow.java
+++ b/src/main/java/org/kohsuke/github/GHWorkflow.java
@@ -156,6 +156,16 @@ public PagedIterable<GHWorkflowRun> listRuns() {
         return new GHWorkflowRunsIterable(owner, root().createRequest().withUrlPath(getApiRoute(), "runs"));
     }
 
+    /**
+     * Workflow run query builder for this workflow.
+     *
+     * @return the GHWorkflowRunQueryBuilder instance for querying runs
+     */
+    public GHWorkflowRunQueryBuilder queryRuns() {
+        return new GHWorkflowRunQueryBuilder(this);
+
+    }
+
     private String getApiRoute() {
         if (owner == null) {
             // Workflow runs returned from search to do not have an owner. Attempt to use url.
diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunQueryBuilder.java b/src/main/java/org/kohsuke/github/GHWorkflowRunQueryBuilder.java
index 105dd77a84..90431af67a 100644
--- a/src/main/java/org/kohsuke/github/GHWorkflowRunQueryBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHWorkflowRunQueryBuilder.java
@@ -11,6 +11,7 @@
  * @see GHRepository#queryWorkflowRuns()
  */
 public class GHWorkflowRunQueryBuilder extends GHQueryBuilder<GHWorkflowRun> {
+    private final GHWorkflow ghWorkflow;
     private final GHRepository repo;
 
     /**
@@ -22,6 +23,19 @@ public class GHWorkflowRunQueryBuilder extends GHQueryBuilder<GHWorkflowRun> {
     GHWorkflowRunQueryBuilder(GHRepository repo) {
         super(repo.root());
         this.repo = repo;
+        this.ghWorkflow = null;
+    }
+
+    /**
+     * Instantiates a new GH workflow run query builder for a specific workflow.
+     *
+     * @param ghWorkflow
+     *            the ghWorkflow
+     */
+    GHWorkflowRunQueryBuilder(GHWorkflow ghWorkflow) {
+        super(ghWorkflow.getRepository().root());
+        this.repo = ghWorkflow.getRepository();
+        this.ghWorkflow = ghWorkflow;
     }
 
     /**
@@ -133,7 +147,12 @@ public GHWorkflowRunQueryBuilder headSha(String headSha) {
      */
     @Override
     public PagedIterable<GHWorkflowRun> list() {
-        return new GHWorkflowRunsIterable(repo, req.withUrlPath(repo.getApiTailUrl("actions/runs")));
+        if (ghWorkflow != null) {
+            req.withUrlPath(repo.getApiTailUrl("actions/workflows"), String.valueOf(ghWorkflow.getId()), "runs");
+        } else {
+            req.withUrlPath(repo.getApiTailUrl("actions/runs"));
+        }
+        return new GHWorkflowRunsIterable(repo, req);
     }
 
     /**
diff --git a/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java b/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java
index 960a8e2307..b44824ffda 100644
--- a/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java
+++ b/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java
@@ -148,14 +148,20 @@ private static Optional<GHWorkflowRun> getWorkflowRun(GHRepository repository,
             String workflowName,
             String branch,
             Conclusion conclusion) {
-        List<GHWorkflowRun> workflowRuns = repository.queryWorkflowRuns()
-                .branch(branch)
-                .conclusion(conclusion)
-                .event(GHEvent.PULL_REQUEST)
-                .list()
-                .withPageSize(20)
-                .iterator()
-                .nextPage();
+        List<GHWorkflowRun> workflowRuns;
+        try {
+            workflowRuns = repository.getWorkflow(workflowName)
+                    .queryRuns()
+                    .branch(branch)
+                    .conclusion(conclusion)
+                    .event(GHEvent.PULL_REQUEST)
+                    .list()
+                    .withPageSize(20)
+                    .iterator()
+                    .nextPage();
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to get workflow run", e);
+        }
 
         for (GHWorkflowRun workflowRun : workflowRuns) {
             if (workflowRun.getName().equals(workflowName)) {