diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
index 41ce50d90d29a4624aadde9661054b3c53f114dd..9c4da485a48916e03ff2389901a044a9dc5e214b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
@@ -96,38 +96,40 @@ class CertificatesViewModel @AssistedInject constructor(
         }
     }
 
-    private fun Collection<TestCertificateWrapper>.toCertificateItems(): List<CertificatesItem> = map { certificate ->
-        val localRegistrationTime = certificate.registeredAt.toUserTimeZone()
+    private fun Collection<TestCertificateWrapper>.toCertificateItems(): List<CertificatesItem> = this
+        .map { certificate ->
+            val localRegistrationTime = certificate.registeredAt.toUserTimeZone()
 
-        if (certificate.isCertificateRetrievalPending) {
-            CovidTestCertificateErrorCard.Item(
-                testDate = localRegistrationTime,
-                isUpdatingData = certificate.isUpdatingData,
-                onRetryAction = {
-                    refreshTestCertificate(certificate.identifier)
-                },
-                onDeleteAction = {
-                    events.postValue(
-                        CertificatesFragmentEvents.ShowDeleteErrorCertificateDialog(
-                            certificate.identifier
+            if (certificate.isCertificateRetrievalPending) {
+                CovidTestCertificateErrorCard.Item(
+                    testDate = localRegistrationTime,
+                    isUpdatingData = certificate.isUpdatingData,
+                    onRetryAction = {
+                        refreshTestCertificate(certificate.identifier)
+                    },
+                    onDeleteAction = {
+                        events.postValue(
+                            CertificatesFragmentEvents.ShowDeleteErrorCertificateDialog(
+                                certificate.identifier
+                            )
                         )
-                    )
-                }
-            )
-        } else {
-            CovidTestCertificateCard.Item(
-                testDate = localRegistrationTime,
-                testPerson =
-                certificate.testCertificate?.firstName + " " +
-                    certificate.testCertificate?.lastName,
-                onClickAction = {
-                    CertificatesFragmentEvents.GoToCovidCertificateDetailScreen(
-                        certificate.identifier
-                    ).run { events.postValue(this) }
-                }
-            )
+                    }
+                )
+            } else {
+                CovidTestCertificateCard.Item(
+                    testDate = localRegistrationTime,
+                    testPerson =
+                    certificate.testCertificate?.firstName + " " +
+                        certificate.testCertificate?.lastName,
+                    onClickAction = {
+                        CertificatesFragmentEvents.GoToCovidCertificateDetailScreen(
+                            certificate.identifier
+                        ).run { events.postValue(this) }
+                    }
+                )
+            }
         }
-    }
+        .sortedByDescending { it.testDate }
 
     @AssistedFactory
     interface Factory : SimpleCWAViewModelFactory<CertificatesViewModel>