diff --git a/pkg/runner/retriever/retriever_test.go b/pkg/runner/retriever/retriever_test.go
index c582c4ae8..62bef9f99 100644
--- a/pkg/runner/retriever/retriever_test.go
+++ b/pkg/runner/retriever/retriever_test.go
@@ -33,12 +33,9 @@ func TestGetMCPServer_WithGroup(t *testing.T) {
 		}
 	}
 
-	if testGroupName == "" {
+	if testGroupName == "" || group == nil {
 		t.Skip("No groups found in registry, skipping group tests")
 	}
-	if group == nil {
-		t.Skip("Test group is nil, skipping")
-	}
 
 	// Find a server in the group to test with
 	var testServerName string