diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
index ba5a22f2c70dae56223cb009a06aaed0375de013..a98b3a0658cdec0df0ad858dfde40873689889af 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
@@ -29,6 +29,8 @@ import javax.inject.Inject;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.briar.android.BriarApplication.EXPIRY_DATE;
+import static org.briarproject.briar.android.TestingConstants.IS_BETA_BUILD;
+import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 import static org.briarproject.briar.android.controller.BriarControllerImpl.DOZE_ASK_AGAIN;
 import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.NO;
 import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.SHOW;
@@ -106,6 +108,10 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 
 	@Override
 	public void showExpiryWarning(ResultHandler<ExpiryWarning> handler) {
+		if (!IS_DEBUG_BUILD && !IS_BETA_BUILD) {
+			handler.onResult(NO);
+			return;
+		}
 		runOnDbThread(() -> {
 			try {
 				Settings settings =
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index fa95e33a85332e1adc11461a06b8964fc4301c91..3393d6889d7581f8c13c04d6f71208cae93666f2 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -34,10 +34,10 @@
 	<string name="startup_failed_db_error">For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contacts are lost. Unfortunately, you need to reinstall Briar and set up a new account.</string>
 	<string name="startup_failed_service_error">Briar was unable to start a required plugin. Reinstalling Briar usually solves this problem. However, please note that you will then lose your account and all data associated with it since Briar is not using central servers to store your data on.</string>
 	<plurals name="expiry_warning">
-		<item quantity="one">This is a beta version of Briar. Your account will expire in %d day and cannot be renewed.</item>
-		<item quantity="other">This is a beta version of Briar. Your account will expire in %d days and cannot be renewed.</item>
+		<item quantity="one">This is a test version of Briar. Your account will expire in %d day and cannot be renewed.</item>
+		<item quantity="other">This is a test version of Briar. Your account will expire in %d days and cannot be renewed.</item>
 	</plurals>
-	<string name="expiry_update">The beta expiry date has been extended. Your account will now expire in %d days.</string>
+	<string name="expiry_update">The testing expiry date has been extended. Your account will now expire in %d days.</string>
 	<string name="expiry_date_reached">This software has expired.\nThank you for testing!</string>
 
 	<!-- Navigation Drawer -->