diff --git a/briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
similarity index 97%
rename from briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java
rename to briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
index b7fb34821..123616bc6 100644
--- a/briar-android/test/java/briarproject/activity/ChangePasswordActivityTest.java
+++ b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
@@ -1,7 +1,6 @@
-package briarproject.activity;
+package org.briarproject.android;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.support.design.widget.TextInputLayout;
 import android.widget.Button;
@@ -9,7 +8,6 @@ import android.widget.EditText;
 
 import org.briarproject.BuildConfig;
 import org.briarproject.R;
-import org.briarproject.android.SettingsActivity;
 import org.briarproject.android.controller.PasswordController;
 import org.briarproject.android.controller.SetupController;
 import org.briarproject.android.controller.handler.ResultHandler;
@@ -26,7 +24,6 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
 
 import static junit.framework.Assert.assertEquals;
 import static org.briarproject.api.crypto.PasswordStrengthEstimator.NONE;
@@ -43,7 +40,6 @@ import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21,
diff --git a/briar-android/test/java/briarproject/activity/SetupActivityTest.java b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java
similarity index 99%
rename from briar-android/test/java/briarproject/activity/SetupActivityTest.java
rename to briar-android/test/java/org/briarproject/android/SetupActivityTest.java
index ebd1120b2..1b84a05ae 100644
--- a/briar-android/test/java/briarproject/activity/SetupActivityTest.java
+++ b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java
@@ -1,4 +1,4 @@
-package briarproject.activity;
+package org.briarproject.android;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,7 +11,6 @@ import com.google.common.base.Strings;
 
 import org.briarproject.BuildConfig;
 import org.briarproject.R;
-import org.briarproject.android.NavDrawerActivity;
 import org.briarproject.android.controller.SetupController;
 import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.android.util.StrengthMeter;
diff --git a/briar-android/test/java/briarproject/activity/TestBriarApplication.java b/briar-android/test/java/org/briarproject/android/TestBriarApplication.java
similarity index 76%
rename from briar-android/test/java/briarproject/activity/TestBriarApplication.java
rename to briar-android/test/java/org/briarproject/android/TestBriarApplication.java
index 9da4a6fe3..6250040a1 100644
--- a/briar-android/test/java/briarproject/activity/TestBriarApplication.java
+++ b/briar-android/test/java/org/briarproject/android/TestBriarApplication.java
@@ -1,13 +1,8 @@
-package briarproject.activity;
+package org.briarproject.android;
 
 import android.app.Application;
 
 import org.briarproject.CoreModule;
-import org.briarproject.android.AndroidComponent;
-import org.briarproject.android.AndroidEagerSingletons;
-import org.briarproject.android.AppModule;
-import org.briarproject.android.BriarApplication;
-import org.briarproject.android.DaggerAndroidComponent;
 
 import java.util.logging.Logger;
 
diff --git a/briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java b/briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java
similarity index 84%
rename from briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java
rename to briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java
index a5dc6669d..21d57e4fb 100644
--- a/briar-android/test/java/briarproject/activity/TestChangePasswordActivity.java
+++ b/briar-android/test/java/org/briarproject/android/TestChangePasswordActivity.java
@@ -1,7 +1,5 @@
-package briarproject.activity;
+package org.briarproject.android;
 
-import org.briarproject.android.ChangePasswordActivity;
-import org.briarproject.android.SetupActivity;
 import org.briarproject.android.controller.PasswordController;
 import org.briarproject.android.controller.SetupController;
 
diff --git a/briar-android/test/java/briarproject/activity/TestSetupActivity.java b/briar-android/test/java/org/briarproject/android/TestSetupActivity.java
similarity index 83%
rename from briar-android/test/java/briarproject/activity/TestSetupActivity.java
rename to briar-android/test/java/org/briarproject/android/TestSetupActivity.java
index 2b4b9d6a1..bb4598752 100644
--- a/briar-android/test/java/briarproject/activity/TestSetupActivity.java
+++ b/briar-android/test/java/org/briarproject/android/TestSetupActivity.java
@@ -1,6 +1,5 @@
-package briarproject.activity;
+package org.briarproject.android;
 
-import org.briarproject.android.SetupActivity;
 import org.briarproject.android.controller.SetupController;
 
 /**
diff --git a/briar-android/test/java/briarproject/activity/ForumActivityTest.java b/briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java
similarity index 95%
rename from briar-android/test/java/briarproject/activity/ForumActivityTest.java
rename to briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java
index bb6aeda39..38f64c5b2 100644
--- a/briar-android/test/java/briarproject/activity/ForumActivityTest.java
+++ b/briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java
@@ -1,4 +1,4 @@
-package briarproject.activity;
+package org.briarproject.android.forum;
 
 import android.content.Intent;
 
@@ -6,10 +6,8 @@ import junit.framework.Assert;
 
 import org.briarproject.BuildConfig;
 import org.briarproject.TestUtils;
+import org.briarproject.android.TestBriarApplication;
 import org.briarproject.android.controller.handler.UiResultHandler;
-import org.briarproject.android.forum.ForumActivity;
-import org.briarproject.android.forum.ForumController;
-import org.briarproject.android.forum.ForumEntry;
 import org.briarproject.api.identity.Author;
 import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.sync.GroupId;
diff --git a/briar-android/test/java/briarproject/activity/TestForumActivity.java b/briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java
similarity index 83%
rename from briar-android/test/java/briarproject/activity/TestForumActivity.java
rename to briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java
index 9455ace7e..43dc89985 100644
--- a/briar-android/test/java/briarproject/activity/TestForumActivity.java
+++ b/briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java
@@ -1,11 +1,8 @@
-package briarproject.activity;
+package org.briarproject.android.forum;
 
 import org.briarproject.android.ActivityModule;
 import org.briarproject.android.controller.BriarController;
 import org.briarproject.android.controller.BriarControllerImpl;
-import org.briarproject.android.forum.ForumActivity;
-import org.briarproject.android.forum.ForumController;
-import org.briarproject.android.forum.ForumControllerImpl;
 import org.mockito.Mockito;
 
 /**