diff --git a/app/src/amazon/java/eu/faircode/email/ActivityBilling.java b/app/src/amazon/java/eu/faircode/email/ActivityBilling.java
index 44328b211d..c78810ac18 100644
--- a/app/src/amazon/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/amazon/java/eu/faircode/email/ActivityBilling.java
@@ -139,7 +139,7 @@ public class ActivityBilling extends ActivityBase implements PurchasingListener,
 
     static boolean isTesting(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return (BuildConfig.DEBUG && prefs.getBoolean("test_iab", false));
+        return (BuildConfig.TEST_RELEASE && prefs.getBoolean("test_iab", false));
     }
 
     private static String getChallenge(Context context) throws NoSuchAlgorithmException {
diff --git a/app/src/fdroid/java/eu/faircode/email/ActivityBilling.java b/app/src/fdroid/java/eu/faircode/email/ActivityBilling.java
index fbe51358e1..c0f639c2b6 100644
--- a/app/src/fdroid/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/fdroid/java/eu/faircode/email/ActivityBilling.java
@@ -164,7 +164,7 @@ public class ActivityBilling extends ActivityBase implements /*PurchasesUpdatedL
 
     static boolean isTesting(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return (BuildConfig.DEBUG && prefs.getBoolean("test_iab", false));
+        return (BuildConfig.TEST_RELEASE && prefs.getBoolean("test_iab", false));
     }
 
     private static String getChallenge(Context context) throws NoSuchAlgorithmException {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index a11e769ac7..37b24aa281 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1348,7 +1348,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvExternalStorageFolder.setText(external.getAbsolutePath() + (emulated ? " emulated" : ""));
 
         swExactAlarms.setEnabled(AlarmManagerCompatEx.canScheduleExactAlarms(getContext()));
-        swTestIab.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
+        swTestIab.setVisibility(BuildConfig.TEST_RELEASE ? View.VISIBLE : View.GONE);
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 
diff --git a/app/src/play/java/eu/faircode/email/ActivityBilling.java b/app/src/play/java/eu/faircode/email/ActivityBilling.java
index e6dcd5b114..f893e1c946 100644
--- a/app/src/play/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/play/java/eu/faircode/email/ActivityBilling.java
@@ -164,7 +164,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
 
     static boolean isTesting(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return (BuildConfig.DEBUG && prefs.getBoolean("test_iab", false));
+        return (BuildConfig.TEST_RELEASE && prefs.getBoolean("test_iab", false));
     }
 
     private static String getChallenge(Context context) throws NoSuchAlgorithmException {