diff --git a/server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java b/server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
index f33d1d40a2..f873c8edb5 100644
--- a/server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
+++ b/server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
@@ -139,6 +139,8 @@ void beforeMethod()
    {
       resetAllMocks();
       resetAllCaptures();
+
+      setupDefaultMockExpectations();
    }
 
    private AppPresenter newAppPresenter()
@@ -153,7 +155,6 @@ private AppPresenter newAppPresenter()
 
    public void testPerformsRequiredActionsOnBind()
    {
-      setupDefaultMockExpectations();
 
       // default mock expectations include:
       // - bind doclistpresenter
@@ -175,7 +176,9 @@ public void testPerformsRequiredActionsOnBind()
 
    public void testShowsNotificationEvents()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay);
@@ -200,7 +203,9 @@ public void testShowsNotificationEvents()
 
    public void testShowsUpdatedProjectStats()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay);
@@ -220,7 +225,9 @@ public void testShowsUpdatedProjectStats()
 
    public void testUpdateProjectStatsFromEditorView()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
       HistoryToken token = loadDocAndViewEditor();
 
@@ -236,7 +243,9 @@ public void testUpdateProjectStatsFromEditorView()
 
    public void testHistoryTriggersDocumentSelectionEvent()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay, mockDocumentListPresenter);
@@ -264,7 +273,9 @@ public void testHistoryTriggersDocumentSelectionEvent()
 
    public void testHistoryTriggersViewChange()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay, mockDocumentListPresenter);
@@ -294,7 +305,9 @@ public void testHistoryTriggersViewChange()
 
    public void testNoEditorWithoutValidDocument()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay, mockDocumentListPresenter);
@@ -315,7 +328,9 @@ public void testNoEditorWithoutValidDocument()
 
    public void testHistoryTriggersDocumentNameStatsUpdate()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       reset(mockDisplay, mockDocumentListPresenter);
@@ -350,7 +365,9 @@ public void testHistoryTriggersDocumentNameStatsUpdate()
     */
    public void testStatsAndNameChangeWithView()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       HistoryToken token = loadDocAndViewEditor();
@@ -361,7 +378,9 @@ public void testStatsAndNameChangeWithView()
 
    public void testShowsUpdatedDocumentStats()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       // must be in editor to see document stats
@@ -380,7 +399,9 @@ public void testShowsUpdatedDocumentStats()
 
    public void testDoesNotShowWrongDocumentStats()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
       loadDocAndViewEditor();
 
@@ -398,7 +419,9 @@ public void testDoesNotShowWrongDocumentStats()
 
    public void testUpdateDocumentStatsFromDoclistView()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
       HistoryToken token = loadDocAndViewEditor();
       token = returnToDoclistView(token, emptyProjectStats);
@@ -415,7 +438,6 @@ public void testUpdateDocumentStatsFromDoclistView()
 
    public void testDismiss()
    {
-      setupDefaultMockExpectations();
       appPresenter = newAppPresenter();
       String testMessage = "testing";
 
@@ -438,7 +460,9 @@ public void testDismiss()
 
    public void testDocumentsLinkGeneratesHistoryToken()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
       ClickEvent docLinkClickEvent = createMock(ClickEvent.class);
       // replay(docLinkClickEvent);
@@ -485,7 +509,9 @@ public void testDocumentsLinkGeneratesHistoryToken()
 
    public void testSearchLinkGeneratesHistoryToken()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       //simulate click
@@ -499,7 +525,9 @@ public void testSearchLinkGeneratesHistoryToken()
 
    public void testShowsHidesReadonlyLabel()
    {
-      setupAndBindAppPresenter();
+      replayAllMocks();
+      appPresenter = newAppPresenter();
+      appPresenter.bind();
       verifyAllMocks();
 
       // display expect show readonly
@@ -630,14 +658,6 @@ private void returnToEditorView(HistoryToken previousToken, TranslationStats exp
       });
    }
 
-   private void setupAndBindAppPresenter()
-   {
-      setupDefaultMockExpectations();
-      replayAllMocks();
-      appPresenter = newAppPresenter();
-      appPresenter.bind();
-   }
-
    private void setupDefaultMockExpectations()
    {
       expect(mockDisplay.getSignOutLink()).andReturn(mockSignoutLink).anyTimes();