diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index ae065c3f0afb4b5f2b5b6b5d5c85f5a016189f3e..863839fac762553415f2879edd75aaface42eeaa 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -127,7 +127,7 @@ android {
             applicationIdSuffix '.test'
 
             ext {
-                envTypeDefault = [debug: "INT", release: "WRU-XD"]
+                envTypeDefault = [debug: "INT", release: "WRU"]
             }
 
             if (signingPropFile.canRead()) {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt
index cded06c92cf5f0f3783bcc1bb2c3f4684d72e03e..9d9acada74110fd369e72517698533533862a493 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt
@@ -1,13 +1,24 @@
 package de.rki.coronawarnapp.environment
 
-import io.kotest.matchers.collections.shouldBeIn
+import de.rki.coronawarnapp.BuildConfig
+import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
 import testhelpers.BaseTest
 
 class BuildConfigWrapTest : BaseTest() {
 
     @Test
-    fun `default environment type should be DEV`() {
-        BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBeIn listOf("DEV", "INT", "WRU-XD", "PROD")
+    fun `default environment type `() {
+        if (BuildConfig.FLAVOR == "deviceForTesters" && BuildConfig.BUILD_TYPE == "debug") {
+            BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "INT"
+        } else if (BuildConfig.FLAVOR == "deviceForTesters" && BuildConfig.BUILD_TYPE == "release") {
+            BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "WRU"
+        } else if (BuildConfig.FLAVOR == "device" && BuildConfig.BUILD_TYPE == "debug") {
+            BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "INT"
+        } else if (BuildConfig.FLAVOR == "device" && BuildConfig.BUILD_TYPE == "release") {
+            BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "PROD"
+        } else {
+            throw IllegalStateException("Unknown flavor/build combination.")
+        }
     }
 }