diff --git a/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
index 820b4bf251886f09fb2da02c77f49dbc1c785d33..54ea446e82a9d118819d2f66190ff5800b486fb8 100644
--- a/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
+++ b/briar-android/test/java/org/briarproject/android/ChangePasswordActivityTest.java
@@ -46,6 +46,8 @@ import static org.mockito.Mockito.when;
 		application = TestBriarApplication.class)
 public class ChangePasswordActivityTest {
 
+	private static final int TIMEOUT_MS = 10 * 1000;
+
 	private TestChangePasswordActivity changePasswordActivity;
 	private TextInputLayout passwordConfirmationWrapper;
 	private EditText currentPassword;
@@ -68,21 +70,16 @@ public class ChangePasswordActivityTest {
 				Robolectric.setupActivity(TestChangePasswordActivity.class);
 		passwordConfirmationWrapper = (TextInputLayout) changePasswordActivity
 				.findViewById(R.id.new_password_confirm_wrapper);
-		currentPassword =
-				(EditText) changePasswordActivity
-						.findViewById(R.id.current_password_entry);
-		newPassword =
-				(EditText) changePasswordActivity
-						.findViewById(R.id.new_password_entry);
-		newPasswordConfirmation =
-				(EditText) changePasswordActivity
-						.findViewById(R.id.new_password_confirm);
-		strengthMeter =
-				(StrengthMeter) changePasswordActivity
-						.findViewById(R.id.strength_meter);
-		changePasswordButton =
-				(Button) changePasswordActivity
-						.findViewById(R.id.change_password);
+		currentPassword = (EditText) changePasswordActivity
+				.findViewById(R.id.current_password_entry);
+		newPassword = (EditText) changePasswordActivity
+				.findViewById(R.id.new_password_entry);
+		newPasswordConfirmation = (EditText) changePasswordActivity
+				.findViewById(R.id.new_password_confirm);
+		strengthMeter = (StrengthMeter) changePasswordActivity
+				.findViewById(R.id.strength_meter);
+		changePasswordButton = (Button) changePasswordActivity
+				.findViewById(R.id.change_password);
 	}
 
 	private void testStrengthMeter(String pass, float strength, int color) {
@@ -148,27 +145,23 @@ public class ChangePasswordActivityTest {
 		// mock a resulthandler
 		ResultHandler<Void> resultHandler =
 				(ResultHandler<Void>) mock(ResultHandler.class);
-		setupController
-				.storeAuthorInfo("nick", "some.old.pass", resultHandler);
+		setupController.storeAuthorInfo("nick", "some.old.pass", resultHandler);
 		// blocking verification call with timeout that waits until the mocked
 		// result gets called with handle 0L, the expected value
-		verify(resultHandler, timeout(2000).times(1))
-				.onResult(null);
-		SharedPreferences prefs =
-				changePasswordActivity
-						.getSharedPreferences("db", Context.MODE_PRIVATE);
+		verify(resultHandler, timeout(TIMEOUT_MS).times(1)).onResult(null);
+		SharedPreferences prefs = changePasswordActivity
+				.getSharedPreferences("db", Context.MODE_PRIVATE);
 		// Confirm database key
 		assertTrue(prefs.contains("key"));
 		String oldKey = prefs.getString("key", null);
 		// mock a resulthandler
 		ResultHandler<Boolean> resultHandler2 =
 				(ResultHandler<Boolean>) mock(ResultHandler.class);
-		passwordController
-				.changePassword("some.old.pass", "some.strong.pass",
-						resultHandler2);
+		passwordController.changePassword("some.old.pass", "some.strong.pass",
+				resultHandler2);
 		// blocking verification call with timeout that waits until the mocked
 		// result gets called with handle 0L, the expected value
-		verify(resultHandler2, timeout(2000).times(1)).onResult(true);
+		verify(resultHandler2, timeout(TIMEOUT_MS).times(1)).onResult(true);
 		// Confirm database key
 		assertTrue(prefs.contains("key"));
 		assertNotEquals(oldKey, prefs.getString("key", null));
diff --git a/briar-android/test/java/org/briarproject/android/SetupActivityTest.java b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java
index efc0491d7e31bf5b33e6b477af4a6b59af1aaf82..05a57f9ee14a7e0d4c9a2972572fab0fd4fc73dc 100644
--- a/briar-android/test/java/org/briarproject/android/SetupActivityTest.java
+++ b/briar-android/test/java/org/briarproject/android/SetupActivityTest.java
@@ -50,6 +50,8 @@ import static org.robolectric.Shadows.shadowOf;
 		application = TestBriarApplication.class)
 public class SetupActivityTest {
 
+	private static final int TIMEOUT_MS = 10 * 1000;
+
 	private TestSetupActivity setupActivity;
 	private TextInputLayout nicknameEntryWrapper;
 	private TextInputLayout passwordConfirmationWrapper;
@@ -157,11 +159,10 @@ public class SetupActivityTest {
 		// mock a resulthandler
 		ResultHandler<Void> resultHandler =
 				(ResultHandler<Void>) mock(ResultHandler.class);
-		controller
-				.storeAuthorInfo("nick", "some.strong.pass", resultHandler);
+		controller.storeAuthorInfo("nick", "some.strong.pass", resultHandler);
 		// blocking verification call with timeout that waits until the mocked
 		// result gets called with handle 0L, the expected value
-		verify(resultHandler, timeout(2000).times(1)).onResult(null);
+		verify(resultHandler, timeout(TIMEOUT_MS).times(1)).onResult(null);
 		SharedPreferences prefs =
 				setupActivity.getSharedPreferences("db", Context.MODE_PRIVATE);
 		// Confirm database key