diff --git a/internal/pkg/clients/init.go b/internal/pkg/clients/init.go
index 575bcee2..b9af108c 100644
--- a/internal/pkg/clients/init.go
+++ b/internal/pkg/clients/init.go
@@ -27,7 +27,7 @@ var AllClients map[string][]string = map[string][]string{
 		"prysm",
 		"teku",
 		"lodestar",
-		"grandine",//add grandine
+		"grandine",
 	},
 	"validator": {
 		"lighthouse",
diff --git a/internal/pkg/generate/generate_scripts_test.go b/internal/pkg/generate/generate_scripts_test.go
index 38ad4355..9c911c18 100644
--- a/internal/pkg/generate/generate_scripts_test.go
+++ b/internal/pkg/generate/generate_scripts_test.go
@@ -293,16 +293,21 @@ func generateTestCases(t *testing.T) (tests []genTestData) {
 						},
 						CheckFunctions: []CheckFunc{defaultFunc, checkOnlyConsensus, checkValidatorBlocker},
 					},
-					genTestData{
-						Description: fmt.Sprintf(baseDescription+"validator: %s, network: %s, only validator", consensusCl, network),
-						GenerationData: &GenData{
-							ValidatorClient: &clients.Client{Name: consensusCl},
-							Network:         network,
-							Services:        []string{validator},
-						},
-						CheckFunctions: []CheckFunc{defaultFunc, checkOnlyValidator, checkValidatorBlocker},
-					},
 				)
+				// Only add the "only validator" test case if consensus client is not "grandine"
+				if consensusCl != "grandine" {
+					tests = append(tests,
+						genTestData{
+							Description: fmt.Sprintf(baseDescription+"validator: %s, network: %s, only validator", consensusCl, network),
+							GenerationData: &GenData{
+								ValidatorClient: &clients.Client{Name: consensusCl},
+								Network:         network,
+								Services:        []string{validator},
+							},
+							CheckFunctions: []CheckFunc{defaultFunc, checkOnlyValidator, checkValidatorBlocker},
+						},
+					)
+			}
 				if utils.Contains(validatorClients, consensusCl) {
 					tests = append(tests,
 						genTestData{