diff --git a/cmd/stringer/golden_test.go b/cmd/stringer/golden_test.go
index 2c418d22..12bd5382 100644
--- a/cmd/stringer/golden_test.go
+++ b/cmd/stringer/golden_test.go
@@ -110,7 +110,6 @@ const (
 var (
 	_Gap_index_0 = [...]uint8{0, 3, 8}
 	_Gap_index_1 = [...]uint8{0, 4, 7, 12, 17, 21}
-	_Gap_index_2 = [...]uint8{0, 6}
 )
 
 func (i Gap) String() string {
diff --git a/cmd/stringer/stringer.go b/cmd/stringer/stringer.go
index 50dec936..90c81bfa 100644
--- a/cmd/stringer/stringer.go
+++ b/cmd/stringer/stringer.go
@@ -487,7 +487,9 @@ func (g *Generator) declareIndexAndNameVars(runs [][]Value, typeName string) {
 	var indexes, names []string
 	for i, run := range runs {
 		index, name := g.createIndexAndNameDecl(run, typeName, fmt.Sprintf("_%d", i))
-		indexes = append(indexes, index)
+		if len(run) != 1 {
+			indexes = append(indexes, index)
+		}
 		names = append(names, name)
 	}
 	g.Printf("const (\n")
@@ -495,11 +497,14 @@ func (g *Generator) declareIndexAndNameVars(runs [][]Value, typeName string) {
 		g.Printf("\t%s\n", name)
 	}
 	g.Printf(")\n\n")
-	g.Printf("var (")
-	for _, index := range indexes {
-		g.Printf("\t%s\n", index)
+
+	if len(indexes) > 0 {
+		g.Printf("var (")
+		for _, index := range indexes {
+			g.Printf("\t%s\n", index)
+		}
+		g.Printf(")\n\n")
 	}
-	g.Printf(")\n\n")
 }
 
 // declareIndexAndNameVar is the single-run version of declareIndexAndNameVars