diff --git a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java
index 9b00468a6..102d41ee7 100644
--- a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java
+++ b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java
@@ -39,11 +39,11 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static java.lang.Thread.sleep;
+import static org.briarproject.android.dontkillmelib.DozeUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.OverlayTapViewAction.visualClick;
 import static org.briarproject.briar.android.ViewActions.waitFor;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.junit.Assert.assertTrue;
 
diff --git a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java
index 5c34a5e39..6b713b31e 100644
--- a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java
+++ b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java
@@ -26,9 +26,9 @@ import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static org.briarproject.android.dontkillmelib.DozeUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 import static org.hamcrest.Matchers.allOf;
 import static org.junit.Assert.assertTrue;
 
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java b/briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java
index 3cc74b11d..e96fe0917 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java
@@ -3,6 +3,7 @@ package org.briarproject.briar.android.account;
 import android.app.Application;
 import android.content.Context;
 
+import org.briarproject.android.dontkillmelib.DozeHelper;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.test.BrambleMockTestCase;
@@ -48,7 +49,7 @@ public class SetupViewModelTest extends BrambleMockTestCase {
 		context.checking(new Expectations() {{
 			oneOf(accountManager).accountExists();
 			will(returnValue(false));
-			allowing(dozeHelper).needToShowDozeFragment(app);
+			allowing(dozeHelper).needToShowDoNotKillMeFragment(app);
 			allowing(app).getApplicationContext();
 			will(returnValue(appContext));
 			allowing(appContext).getPackageManager();