diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java
index 085d9d60154..a50626c2d8c 100644
--- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java
+++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java
@@ -182,7 +182,7 @@ static Stream<TestCase> crdApprovalCasesApiV2(String crdVersion) {
     final List<TestCase> cases = new ArrayList<>();
     for (boolean parallel : new boolean[] { false, true }) {
       cases.add(new TestCase("printercolumns.sample.fabric8.io", crdVersion, parallel, PrinterColumn.class));
-      cases.add(new TestCase("validations.samples.fabric8.io", crdVersion, parallel, Validation.class));
+      cases.add(new TestCase("validations.sample.fabric8.io", crdVersion, parallel, Validation.class));
     }
     return cases.stream();
   }
diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java
index bc77956e814..6a03c467811 100644
--- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java
+++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java
@@ -20,6 +20,6 @@
 import io.fabric8.kubernetes.model.annotation.Version;
 
 @Version("v1alpha1")
-@Group("samples.fabric8.io")
+@Group("sample.fabric8.io")
 public class Validation extends CustomResource<ValidationSpec, Void> {
 }
diff --git a/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml b/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml
similarity index 99%
rename from crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml
rename to crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml
index a67600a5760..3c600e80ec6 100644
--- a/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml
+++ b/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml
@@ -2,9 +2,9 @@
 apiVersion: "apiextensions.k8s.io/v1"
 kind: "CustomResourceDefinition"
 metadata:
-  name: "validations.samples.fabric8.io"
+  name: "validations.sample.fabric8.io"
 spec:
-  group: "samples.fabric8.io"
+  group: "sample.fabric8.io"
   names:
     kind: "Validation"
     plural: "validations"