2 files changed, 6 insertions, 2 deletions
diff --git a/library/full-support/test/src/com/android/setupwizardlib/template/RecyclerMixinTest.java b/library/full-support/test/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
index 0be9d47..79105d6 100644
--- a/library/full-support/test/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
+++ b/library/full-support/test/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
@@ -19,7 +19,9 @@ package com.android.setupwizardlib.template;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
@@ -64,7 +66,7 @@ public class RecyclerMixinTest {
         mTemplateLayout = spy(new TemplateLayout(mContext, R.layout.test_template,
                 R.id.suw_layout_content));
 
-        mRecyclerView = spy(new RecyclerView(mContext));
+        mRecyclerView = mock(RecyclerView.class, delegatesTo(new RecyclerView(mContext)));
 
         doReturn(true).when(mTemplateLayout).isLayoutDirectionResolved();
     }
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java
index 5151c32..93201ca 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/ListMixinTest.java
@@ -19,8 +19,10 @@ package com.android.setupwizardlib.template;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
@@ -66,7 +68,7 @@ public class ListMixinTest {
         mTemplateLayout = spy(new TemplateLayout(mContext, R.layout.test_template,
                 R.id.suw_layout_content));
 
-        mListView = spy(new ListView(mContext));
+        mListView = mock(ListView.class, delegatesTo(new ListView(mContext)));
         doReturn(1).when(mAdapter).getViewTypeCount();
 
         doReturn(mListView).when(mTemplateLayout)