diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 7c9c775f..7584da81 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -78,6 +78,7 @@ const frontendUrl = computed(() => {
         <div
           class="py-4"
           :class="{ 'heading-1': props.detailView, 'heading-2': !props.detailView }"
+          :data-cy="`certificate-${competenceCertificate.slug}-grade`"
         >
           {{ $t("a.Note") }}: {{ userGrade }}
         </div>
@@ -86,7 +87,10 @@ const frontendUrl = computed(() => {
         {{ $t("a.competenceCertificateNoUserPoints") }}
       </section>
 
-      <div class="text-gray-900">
+      <div
+        class="text-gray-900"
+        :data-cy="`certificate-${competenceCertificate.slug}-grade-percent`"
+      >
         {{ $t("a.Ungerundete Note") }}: {{ userGradeRounded2Places }}
       </div>
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 2847bb35..7beb5b70 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -89,7 +89,11 @@ onMounted(async () => {
         <h3 class="mt-2 lg:order-first lg:mt-0">{{ $t("a.Erfahrungsnote üK") }}</h3>
       </div>
 
-      <section v-if="userPointsEvaluatedAssignments > 0" class="flex items-center">
+      <section
+        v-if="userPointsEvaluatedAssignments > 0"
+        class="flex items-center"
+        data-cy="certificate-total-grade"
+      >
         <div class="heading-1 py-4">{{ $t("a.Note") }}: {{ totalGrade }}</div>
       </section>
       <section v-else class="my-4">
diff --git a/client/src/services/__tests__/assignmentService.spec.ts b/client/src/services/__tests__/assignmentService.spec.ts
index bc41c610..d5d923c1 100644
--- a/client/src/services/__tests__/assignmentService.spec.ts
+++ b/client/src/services/__tests__/assignmentService.spec.ts
@@ -85,5 +85,4 @@ describe("assignmentService", () => {
     expect(percentToRoundedGrade(1 / 24, false)).toBeCloseTo(1.21);
     expect(percentToRoundedGrade(0 / 24, false)).toBeCloseTo(1);
   });
-
 });
diff --git a/cypress/e2e/competenceNavi/competenceCertificate.cy.js b/cypress/e2e/competenceNavi/competenceCertificate.cy.js
index 79da7587..0eda2399 100644
--- a/cypress/e2e/competenceNavi/competenceCertificate.cy.js
+++ b/cypress/e2e/competenceNavi/competenceCertificate.cy.js
@@ -14,9 +14,7 @@ describe("competenceCertificate.cy.js", () => {
 
     cy.get(
       '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
-    )
-      .should("contain", "0 von 0 Punkten")
-      .and("contain", "0 von 2 Kompetenznachweis-Elementen");
+    ).and("contain", "0 von 2 Kompetenznachweis-Elementen");
 
     // check on certificates page
     cy.get('[data-cy="certificates-show-all-button"]').click();
@@ -54,25 +52,31 @@ describe("competenceCertificate.cy.js", () => {
     cy.visit("/course/test-lehrgang/competence");
 
     cy.get('[data-cy="certificate-total-points-text"]').contains(
-      "Zwischenstand Gesamtpunktzahl: 19 von 24 Punkten"
+      "Erfahrungsnote üK: 5"
     );
 
     cy.get(
       '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
     )
-      .should("contain", "19 von 24 Punkten")
+      .should("contain", "Note: 5")
       .and("contain", "1 von 2 Kompetenznachweis-Elementen");
 
     // check on certificates page
     cy.get('[data-cy="certificates-show-all-button"]').click();
     cy.get('[data-cy="certificate-total-points-text"]')
-      .should("contain", "19")
+      .should("contain", "Erfahrungsnote üK")
       .and("contain", "Zwischenstand");
+    cy.get('[data-cy="certificate-total-grade"]').should("contain", "Note: 5");
 
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade"]'
+    ).should("contain", "Note: 5");
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade-percent"]'
+    ).should("contain", "Ungerundete Note: 4.96");
     cy.get(
       '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
     )
-      .should("contain", "19")
       .and("contain", "Zwischenstand")
       .and("contain", "1 von 2 Kompetenznachweis-Elementen");
 
@@ -113,6 +117,13 @@ describe("competenceCertificate.cy.js", () => {
       "/course/test-lehrgang/competence/certificates/kompetenznachweis-1"
     );
 
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade"]'
+    ).should("contain", "Note: 3");
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade-percent"]'
+    ).should("contain", "Ungerundete Note: 3.08");
+
     cy.get(
       '[data-cy="assignment-test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"]'
     )
@@ -139,27 +150,33 @@ describe("competenceCertificate.cy.js", () => {
     cy.visit("/course/test-lehrgang/competence");
 
     cy.get('[data-cy="certificate-total-points-text"]').contains(
-      "Zwischenstand Gesamtpunktzahl: 43 von 48 Punkten"
+      "Erfahrungsnote üK: 5.5"
     );
 
     cy.get(
       '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
     )
-      .should("contain", "43 von 48 Punkten")
+      .should("contain", "Note: 5.5")
       .and("contain", "2 von 2 Kompetenznachweis-Elementen");
 
     // check on certificates page
     cy.get('[data-cy="certificates-show-all-button"]').click();
     cy.get('[data-cy="certificate-total-points-text"]')
-      .should("contain", "43")
+      .should("contain", "Erfahrungsnote üK")
+      .and("contain", "Note: 5.5")
       .and("not.contain", "Zwischenstand");
 
     cy.get(
       '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
     )
-      .should("contain", "43")
       .and("not.contain", "Zwischenstand")
       .and("contain", "2 von 2 Kompetenznachweis-Elementen");
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade"]'
+    ).should("contain", "Note: 5.5");
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-grade-percent"]'
+    ).should("contain", "Ungerundete Note: 5.48");
 
     // check certificate detail page
     cy.get(
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 7070b467..b3b4a659 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -395,7 +395,9 @@ def create_test_assignment_evaluation_data(
 def create_edoniq_test_result_data(
     assignment, course_session, assignment_user, user_points=19, max_points=24
 ):
-    assignment.assignment.evaluation_tasks.raw_data[0]['value']['max_points'] = max_points
+    assignment.assignment.evaluation_tasks.raw_data[0]["value"][
+        "max_points"
+    ] = max_points
     assignment.assignment.save()
     if assignment and course_session and assignment_user:
         update_assignment_completion(