diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/TestCertificateDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/TestCertificateDetailsFragment.kt
index cd8ded651a758bcfbf0692ec45c0fffa08b5a5d2..d6c6f7ef5f3648c44c37ac17d36f59a0a039d445 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/TestCertificateDetailsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/TestCertificateDetailsFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.isGone
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
@@ -69,16 +70,32 @@ class TestCertificateDetailsFragment : Fragment(R.layout.fragment_test_certifica
         diseaseType.text = testCertificate.targetName
         testType.text = testCertificate.testType
         testName.text = testCertificate.testName
-        testManufacturer.text = testCertificate.testNameAndManufacturer
         testDate.text = "%s %s".format(
             testDateTime.toDayFormat(),
             testDateTime.toShortTimeFormat()
         )
         testResult.text = testCertificate.testResult
-        testCenter.text = testCertificate.testCenter
         certificateCountry.text = testCertificate.certificateCountry
         certificateIssuer.text = testCertificate.certificateIssuer
         certificateId.text = testCertificate.certificateId
+
+        if (testCertificate.testCenter.isNullOrBlank()) {
+            testCenterTitle.isGone = true
+            testCenter.isGone = true
+        } else {
+            testCenter.text = testCertificate.testCenter
+            testCenter.isGone = false
+            testCenterTitle.isGone = false
+        }
+
+        if (testCertificate.testNameAndManufacturer.isNullOrBlank()) {
+            testManufacturer.isGone = true
+            testManufacturerTitle.isGone = true
+        } else {
+            testManufacturer.text = testCertificate.testNameAndManufacturer
+            testManufacturer.isGone = false
+            testManufacturerTitle.isGone = false
+        }
     }
 
     private fun FragmentTestCertificateDetailsBinding.onQrCodeReady(bitmap: Bitmap?) {
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_certificate_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_certificate_details.xml
index 47182a5ea83ee6eac471a414a87a86aafb73e4af..33ee479ce01ba63221fafcdea6b5792a6f3646ff 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_certificate_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_certificate_details.xml
@@ -208,6 +208,7 @@
                     tools:text="Xep" />
 
                 <TextView
+                    android:id="@+id/test_manufacturer_title"
                     style="@style/body1Medium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -253,6 +254,7 @@
                     tools:text="negative" />
 
                 <TextView
+                    android:id="@+id/test_center_title"
                     style="@style/body1Medium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"