--- a/client/src/test/java/com/redhat/thermostat/client/MainWindowFacadeImplTest.java	Wed Mar 21 20:52:40 2012 +0100
+++ b/client/src/test/java/com/redhat/thermostat/client/MainWindowFacadeImplTest.java	Wed Mar 21 22:23:11 2012 +0100
@@ -37,8 +37,9 @@
 package com.redhat.thermostat.client;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -49,8 +50,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
 
 import com.mongodb.DB;
 import com.redhat.thermostat.client.ui.MainWindow;
@@ -70,16 +71,10 @@
         controller = new MainWindowFacadeImpl(db);
         controller = spy(controller);
         view = mock(MainWindow.class);
-        doAnswer(new Answer<Void>() {
-
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                l = (PropertyChangeListener) invocation.getArguments()[0];
-                return null;
-            }
-            
-        }).when(view).addViewPropertyListener(any(PropertyChangeListener.class));
+        ArgumentCaptor<PropertyChangeListener> grabListener = ArgumentCaptor.forClass(PropertyChangeListener.class);
+        doNothing().when(view).addViewPropertyListener(grabListener.capture());
         controller.initView(view);
+        l = grabListener.getValue();
     }
 
     @After