diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b74f135e..562e186f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
           thresholds: "60 80"
       - name: Add Coverage PR Comment
         uses: marocchino/sticky-pull-request-comment@v2
-        if: ${{ github.event_name == 'pull_request' && github.repository == 'hasura/go-graphql-client' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }}
         with:
           path: code-coverage-results.md
       - name: Dump docker logs on failure
diff --git a/subscription_graphql_ws_test.go b/subscription_graphql_ws_test.go
index ac4624a3..ac711e64 100644
--- a/subscription_graphql_ws_test.go
+++ b/subscription_graphql_ws_test.go
@@ -576,14 +576,13 @@ func waitForConnectionState(t *testing.T, sc *SubscriptionClient, tickerDuration
 	defer ticker.Stop()
 
 	for {
-		select {
-		case <-ticker.C:
-			if checkFn() {
-				return true
-			}
-			if time.Now().After(deadline) {
-				return false
-			}
+		<-ticker.C
+		if checkFn() {
+			return true
+		}
+
+		if time.Now().After(deadline) {
+			return false
 		}
 	}
 }