diff --git a/briar-android/fastlane/Screengrabfile b/briar-android/fastlane/Screengrabfile
index 3afd283cd1303b9f504db96ecdc68447495d3168..bacf6905bc5b584d7dbfd52d01c864f439d184ea 100644
--- a/briar-android/fastlane/Screengrabfile
+++ b/briar-android/fastlane/Screengrabfile
@@ -1,8 +1,8 @@
 app_package_name "org.briarproject.briar.android.screenshot.debug"
 locales ['en-US']
 use_tests_in_classes([
-    'org.briarproject.briar.android.login.SetupActivityTest',
-    'org.briarproject.briar.android.settings.SettingsActivityTest',
+    'org.briarproject.briar.android.login.SetupActivityScreenshotTest',
+    'org.briarproject.briar.android.settings.SettingsActivityScreenshotTest',
 ])
 app_apk_path "build/outputs/apk/screenshot/debug/briar-android-screenshot-debug.apk"
 tests_apk_path "build/outputs/apk/androidTest/screenshot/debug/briar-android-screenshot-debug-androidTest.apk"
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
index 6634d5bfcf285adc7ca5733d5f192fa326882dfc..156620b1de7709f9d38f1195f0fac4951641decb 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
@@ -7,7 +7,7 @@ public class BriarTestComponentApplication extends BriarApplicationImpl {
 
 	@Override
 	protected AndroidComponent createApplicationComponent() {
-		AndroidComponent component = DaggerTestComponent.builder()
+		AndroidComponent component = DaggerBriarUiTestComponent.builder()
 				.appModule(new AppModule(this)).build();
 		// We need to load the eager singletons directly after making the
 		// dependency graphs
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
similarity index 68%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
index 240eb6f14dade5fa9731097e8872f7c7498532a7..af1cba5f01398608fab76dd01f3a52e6c2c9dbf7 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
@@ -5,9 +5,9 @@ import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.login.PasswordActivityTest;
-import org.briarproject.briar.android.login.SetupActivityTest;
+import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
-import org.briarproject.briar.android.settings.SettingsActivityTest;
+import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
 
 import javax.inject.Singleton;
 
@@ -21,11 +21,11 @@ import dagger.Component;
 		BriarAccountModule.class,
 		BrambleCoreModule.class
 })
-public interface TestComponent extends AndroidComponent {
+public interface BriarUiTestComponent extends AndroidComponent {
 
-	void inject(SetupActivityTest test);
+	void inject(SetupActivityScreenshotTest test);
 	void inject(PasswordActivityTest test);
 	void inject(NavDrawerActivityTest test);
-	void inject(SettingsActivityTest test);
+	void inject(SettingsActivityScreenshotTest test);
 
 }
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
index 0f7ce89b97cf47de40369970ca20d168c15251f6..5d9f025d43499e480b643847851850146212b355 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.android.login;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
 import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -28,7 +28,7 @@ public class PasswordActivityTest extends ScreenshotTest {
 			new CleanAccountTestRule<>(PasswordActivity.class);
 
 	@Override
-	protected void inject(TestComponent component) {
+	protected void inject(BriarUiTestComponent component) {
 		component.inject(this);
 	}
 
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
similarity index 95%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
index 922cad65537e05e061e2ade3c97162c1231f48c4..475ae87a19b5d74dd22c57d3eea72deb93726575 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
@@ -7,7 +7,7 @@ import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
 import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,7 +33,7 @@ import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 
 
 @RunWith(AndroidJUnit4.class)
-public class SetupActivityTest extends ScreenshotTest {
+public class SetupActivityScreenshotTest extends ScreenshotTest {
 
 	@Rule
 	public IntentsTestRule<SetupActivity> testRule =
@@ -46,7 +46,7 @@ public class SetupActivityTest extends ScreenshotTest {
 			};
 
 	@Override
-	protected void inject(TestComponent component) {
+	protected void inject(BriarUiTestComponent component) {
 		component.inject(this);
 	}
 
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
index 395ed8c48f655f686586f844d0bb244a47d7d606..e92ae66930d075113804f7a704103ed28c1aecf2 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
@@ -5,7 +5,7 @@ import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
 import org.briarproject.briar.android.settings.SettingsActivity;
 import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
@@ -30,7 +30,7 @@ public class NavDrawerActivityTest extends ScreenshotTest {
 			new CleanAccountTestRule<>(NavDrawerActivity.class);
 
 	@Override
-	protected void inject(TestComponent component) {
+	protected void inject(BriarUiTestComponent component) {
 		component.inject(this);
 	}
 
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
similarity index 91%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
index b5c32f46f2e5986e33f5513fca3c66bb2b1360a1..192680bd70bc26412c8e5a29e68eebfc326ca070 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
@@ -6,7 +6,7 @@ import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
@@ -22,14 +22,14 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 @RunWith(AndroidJUnit4.class)
-public class SettingsActivityTest extends ScreenshotTest {
+public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Rule
 	public CleanAccountTestRule<SettingsActivity> testRule =
 			new CleanAccountTestRule<>(SettingsActivity.class);
 
 	@Override
-	protected void inject(TestComponent component) {
+	protected void inject(BriarUiTestComponent component) {
 		component.inject(this);
 	}
 
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
index 77ed5faac46111f505e45c5770083aac56fff303..355dd77631e83a0e324ca2502d531210dfedc5d8 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
@@ -7,7 +7,7 @@ import android.util.Log;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.briar.android.BriarTestComponentApplication;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
 import org.junit.ClassRule;
 
 import javax.inject.Inject;
@@ -38,10 +38,10 @@ public abstract class ScreenshotTest {
 		BriarTestComponentApplication app =
 				(BriarTestComponentApplication) getTargetContext()
 						.getApplicationContext();
-		inject((TestComponent) app.getApplicationComponent());
+		inject((BriarUiTestComponent) app.getApplicationComponent());
 	}
 
-	protected abstract void inject(TestComponent component);
+	protected abstract void inject(BriarUiTestComponent component);
 
 	protected void screenshot(String name) {
 		try {