diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java
index fd9a12acc..586d83079 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java
@@ -56,6 +56,19 @@ public abstract class UiTest {
 		getApplicationContext().startActivity(i);
 	}
 
+	protected void disableOnboarding() {
+		try {
+			Settings settings = new Settings();
+			settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false);
+			settings.putBoolean(SHOW_ONBOARDING_IMAGE, false);
+			settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false);
+			settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false);
+			settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
+		} catch (DbException e) {
+			throw new AssertionError(e);
+		}
+	}
+
 	@NotNullByDefault
 	protected class CleanAccountTestRule<A extends Activity>
 			extends IntentsTestRule<A> {
@@ -77,17 +90,7 @@ public abstract class UiTest {
 			} catch (InterruptedException e) {
 				throw new AssertionError(e);
 			}
-			try {
-				Settings settings = new Settings();
-				settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false);
-				settings.putBoolean(SHOW_ONBOARDING_IMAGE, false);
-				settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false);
-				settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false);
-				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-			} catch (DbException e) {
-				throw new AssertionError(e);
-			}
+			disableOnboarding();
 		}
 	}
-
 }
diff --git a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java
index 99798ae5b..00f7b5089 100644
--- a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java
+++ b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java
@@ -23,13 +23,13 @@ public abstract class ScreenshotTest extends UiTest {
 	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
 
 	@Inject
-	protected TestDataCreator testDataCreator;
+	TestDataCreator testDataCreator;
 	@Inject
-	protected ConnectionRegistry connectionRegistry;
+	ConnectionRegistry connectionRegistry;
 	@Inject
-	protected Clock clock;
+	Clock clock;
 
-	protected void screenshot(String name, ActivityScenarioRule<?> rule) {
+	void screenshot(String name, ActivityScenarioRule<?> rule) {
 		rule.getScenario().onActivity(activity -> screenshot(name, activity));
 	}
 
@@ -47,9 +47,4 @@ public abstract class ScreenshotTest extends UiTest {
 			Log.w("Screengrab", "Permission to write screenshot is missing.");
 		}
 	}
-
-	protected long getMinutesAgo(int minutes) {
-		return clock.currentTimeMillis() - minutes * 60 * 1000;
-	}
-
 }