diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
index f6887d934..2057562c0 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
@@ -130,36 +130,37 @@ public class HabitListTest extends BaseUnitTest
         h4.setName("D Habit");
         h4.setColor(1);
         h4.setPosition(2);
-        HabitList list;
 
-        list = testOrderingSetup(h1, h2, h3, h4);
+        HabitList list = modelFactory.buildHabitList();
+
+        list.add(h3);
+        list.add(h1);
+        list.add(h4);
+        list.add(h2);
+
         list.setPrimaryOrder(BY_POSITION);
         assertThat(list.getByPosition(0), equalTo(h3));
         assertThat(list.getByPosition(1), equalTo(h1));
         assertThat(list.getByPosition(2), equalTo(h4));
         assertThat(list.getByPosition(3), equalTo(h2));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_NAME_DESC);
         assertThat(list.getByPosition(0), equalTo(h4));
         assertThat(list.getByPosition(1), equalTo(h3));
         assertThat(list.getByPosition(2), equalTo(h2));
         assertThat(list.getByPosition(3), equalTo(h1));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_NAME_ASC);
         assertThat(list.getByPosition(0), equalTo(h1));
         assertThat(list.getByPosition(1), equalTo(h2));
         assertThat(list.getByPosition(2), equalTo(h3));
         assertThat(list.getByPosition(3), equalTo(h4));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_NAME_ASC);
         list.remove(h1);
         list.add(h1);
         assertThat(list.getByPosition(0), equalTo(h1));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_COLOR_ASC);
         list.setSecondaryOrder(BY_NAME_ASC);
         assertThat(list.getByPosition(0), equalTo(h3));
@@ -167,7 +168,6 @@ public class HabitListTest extends BaseUnitTest
         assertThat(list.getByPosition(2), equalTo(h1));
         assertThat(list.getByPosition(3), equalTo(h2));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_COLOR_DESC);
         list.setSecondaryOrder(BY_NAME_ASC);
         assertThat(list.getByPosition(0), equalTo(h1));
@@ -175,7 +175,6 @@ public class HabitListTest extends BaseUnitTest
         assertThat(list.getByPosition(2), equalTo(h4));
         assertThat(list.getByPosition(3), equalTo(h3));
 
-        list = testOrderingSetup(h1, h2, h3, h4);
         list.setPrimaryOrder(BY_POSITION);
         assertThat(list.getByPosition(0), equalTo(h3));
         assertThat(list.getByPosition(1), equalTo(h1));
@@ -183,18 +182,6 @@ public class HabitListTest extends BaseUnitTest
         assertThat(list.getByPosition(3), equalTo(h2));
     }
 
-    private HabitList testOrderingSetup(Habit h1, Habit h2, Habit h3, Habit h4)
-    {
-        HabitList list = modelFactory.buildHabitList();
-
-        list.add(h3);
-        list.add(h1);
-        list.add(h4);
-        list.add(h2);
-
-        return list;
-    }
-
     @Test
     public void testReorder() {
         int operations[][] = {