diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java
new file mode 100644
index 000000000..a1bf65c87
--- /dev/null
+++ b/app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.unit.commands;
+
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import org.isoron.uhabits.BaseTest;
+import org.isoron.uhabits.commands.ChangeHabitColorCommand;
+import org.isoron.uhabits.commands.DeleteHabitsCommand;
+import org.isoron.uhabits.helpers.ColorHelper;
+import org.isoron.uhabits.models.Habit;
+import org.isoron.uhabits.unit.HabitFixtures;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+
+import java.util.LinkedList;
+
+import static junit.framework.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DeleteHabitsCommandTest extends BaseTest
+{
+    private DeleteHabitsCommand command;
+    private LinkedList<Habit> habits;
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setup()
+    {
+        super.setup();
+
+        HabitFixtures.purgeHabits();
+        habits = new LinkedList<>();
+
+        // Habits that shuold be deleted
+        for(int i = 0; i < 3; i ++)
+        {
+            Habit habit = HabitFixtures.createShortHabit();
+            habits.add(habit);
+        }
+
+        // Extra habit that should not be deleted
+        Habit extraHabit = HabitFixtures.createShortHabit();
+        extraHabit.name = "extra";
+        extraHabit.save();
+
+        command = new DeleteHabitsCommand(habits);
+    }
+
+    @Test
+    public void executeUndoRedo()
+    {
+        assertThat(Habit.getAll(true).size(), equalTo(4));
+
+        command.execute();
+        assertThat(Habit.getAll(true).size(), equalTo(1));
+        assertThat(Habit.getAll(true).get(0).name, equalTo("extra"));
+
+        thrown.expect(UnsupportedOperationException.class);
+        command.undo();
+    }
+}