diff --git a/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupActivityTest.java b/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupActivityTest.java
index e2bb2b9f873fafc8cdfa91ac02395bbb85fdfc90..8f266e53cef684bbc1504c66bebf7ecc9db700a8 100644
--- a/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupActivityTest.java
+++ b/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupActivityTest.java
@@ -1,48 +1,23 @@
 package org.briarproject.mailbox.android.login;
 
-import android.support.design.widget.TextInputLayout;
-import android.widget.EditText;
-
-import org.briarproject.mailbox.R;
 import org.briarproject.mailbox.android.TestMailboxApplication;
-import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static junit.framework.Assert.assertEquals;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.util.StringUtils.getRandomString;
-
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 21, application = TestMailboxApplication.class,
 		packageName = "org.briarproject.mailbox")
 public class SetupActivityTest {
 
 	private SetupActivity setupActivity;
-	private TextInputLayout nicknameEntryWrapper;
-	private EditText nicknameEntry;
 
 	@Before
 	public void setUp() {
 		MockitoAnnotations.initMocks(this);
 		setupActivity = Robolectric.setupActivity(SetupActivity.class);
-		nicknameEntryWrapper =
-				setupActivity.findViewById(R.id.nickname_entry_wrapper);
-		nicknameEntry = setupActivity.findViewById(R.id.nickname_entry);
-	}
-
-	@Test
-	public void testNicknameUI() {
-		Assert.assertNotNull(setupActivity);
-		String longNick = getRandomString(MAX_AUTHOR_NAME_LENGTH + 1);
-		nicknameEntry.setText(longNick);
-		// Nickname should be too long
-		assertEquals(nicknameEntryWrapper.getError(),
-				setupActivity.getString(R.string.name_too_long));
 	}
 }
diff --git a/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupControllerImplTest.java b/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupControllerImplTest.java
index d40074c01d2aba00404b5e707cf608acddce272b..c6efaf7b939499c8f5f721c256c2ea641c948b15 100644
--- a/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupControllerImplTest.java
+++ b/mailbox-android/src/test/java/org/briarproject/mailbox/android/login/SetupControllerImplTest.java
@@ -38,15 +38,12 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
 	public void testCreateAccount() {
 		context.checking(new Expectations() {{
 			// Set the author name and password
-			oneOf(setupActivity).setAuthorName(authorName);
 			oneOf(setupActivity).setPassword(password);
 			// Get the author name and password
-			oneOf(setupActivity).getAuthorName();
-			will(returnValue(authorName));
 			oneOf(setupActivity).getPassword();
 			will(returnValue(password));
 			// Create the account
-			oneOf(accountManager).createAccount(authorName, password);
+			oneOf(accountManager).createAccount("user", password);
 			will(returnValue(true));
 		}});
 
@@ -55,7 +52,6 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
 		s.setSetupActivity(setupActivity);
 
 		AtomicBoolean called = new AtomicBoolean(false);
-		s.setAuthorName(authorName);
 		s.setPassword(password);
 		s.createAccount(result -> called.set(true));
 		assertTrue(called.get());