diff --git a/src/test/java/seedu/todo/commons/EphemeralDBTest.java b/src/test/java/seedu/todo/commons/EphemeralDBTest.java
index 7ef6f11ad104..e2734707835b 100644
--- a/src/test/java/seedu/todo/commons/EphemeralDBTest.java
+++ b/src/test/java/seedu/todo/commons/EphemeralDBTest.java
@@ -13,14 +13,14 @@
 public class EphemeralDBTest {
     
     @Test
-    public void check_singleton() {
+    public void ephemeral_testSingleton_match() {
         EphemeralDB one = EphemeralDB.getInstance();
         EphemeralDB two = EphemeralDB.getInstance();
         assertEquals(one, two);
     }
     
     @Test
-    public void test_calendar_items() {
+    public void ephemeral_testCalendarItems_found() {
         CalendarItem task = new Task();
         CalendarItem event = new Event();
         EphemeralDB db = EphemeralDB.getInstance();
@@ -31,14 +31,14 @@ public void test_calendar_items() {
     }
     
     @Test
-    public void test_missing_calendar_item() {
+    public void ephemeral_missingCalendarItem_notFound() {
         EphemeralDB db = EphemeralDB.getInstance();
         assertEquals(db.getCalendarItemsByDisplayedId(0), null);
         assertEquals(db.getCalendarItemsByDisplayedId(3), null);
     }
     
     @Test
-    public void test_clear_calendar_items() {
+    public void ephemeral_clearCalendarItems_notFound() {
         CalendarItem task = new Task();
         CalendarItem event = new Event();
         EphemeralDB db = EphemeralDB.getInstance();
diff --git a/src/test/java/seedu/todo/controllers/ControllerConcernsTests.java b/src/test/java/seedu/todo/controllers/ControllerConcernsTests.java
index b10b795cde25..b5f7f677f60b 100644
--- a/src/test/java/seedu/todo/controllers/ControllerConcernsTests.java
+++ b/src/test/java/seedu/todo/controllers/ControllerConcernsTests.java
@@ -23,21 +23,21 @@ private static Map<String, String[]> getTokenDefinitions() {
     }
     
     @Test
-    public void tokenizer_no_matches() throws Exception {
+    public void tokenizer_noMatch_notFound() throws Exception {
         String input = "abcdefg hijklmnop";
         Map<String, String[]> output = Tokenizer.tokenize(getTokenDefinitions(), input);
         assertTrue(output.isEmpty());
     }
     
     @Test
-    public void tokenizer_empty_string() throws Exception {
+    public void tokenizer_emptyString_notFound() throws Exception {
         String input = "";
         Map<String, String[]> output = Tokenizer.tokenize(getTokenDefinitions(), input);
         assertTrue(output == null);
     }
     
     @Test
-    public void tokenizer_single_match() throws Exception {
+    public void tokenizer_singleMatch_found() throws Exception {
         String input = "token11 answer";
         Map<String, String[]> output = Tokenizer.tokenize(getTokenDefinitions(), input);
         assertEquals(output.get("tokenType1")[0], "token11");
@@ -45,7 +45,7 @@ public void tokenizer_single_match() throws Exception {
     }
     
     @Test
-    public void tokenizer_empty_match() throws Exception {
+    public void tokenizer_emptyMatch_found() throws Exception {
         String input = "alamak token11 token21";
         Map<String, String[]> output = Tokenizer.tokenize(getTokenDefinitions(), input);
         assertEquals(output.get("tokenType1")[0], "token11");
@@ -55,14 +55,14 @@ public void tokenizer_empty_match() throws Exception {
     }
     
     @Test
-    public void tokenizer_match_quotes() throws Exception {
+    public void tokenizer_matchQuotes_found() throws Exception {
         String input = "\"token11\" answer";
         Map<String, String[]> output = Tokenizer.tokenize(getTokenDefinitions(), input);
         assertTrue(output.isEmpty());
     }
     
     @Test(expected=UnmatchedQuotesException.class)
-    public void tokenizer_unmatched_quotes() throws Exception {
+    public void tokenizer_unmatchedQuotes_error() throws Exception {
         String input = "\"\"\"";
         Tokenizer.tokenize(getTokenDefinitions(), input);
     }
diff --git a/src/test/java/seedu/todo/guitests/UndoRedoCommandTest.java b/src/test/java/seedu/todo/guitests/UndoRedoCommandTest.java
index 4c5937bd40e6..d74ba9c4da7d 100644
--- a/src/test/java/seedu/todo/guitests/UndoRedoCommandTest.java
+++ b/src/test/java/seedu/todo/guitests/UndoRedoCommandTest.java
@@ -43,7 +43,7 @@ public void resetDB() {
     }
     
     @Test
-    public void undo_single() {
+    public void undo_single_success() {
         console.runCommand(commandAdd1);
         assertTaskVisible(task1);
         console.runCommand(commandAdd2);
@@ -53,7 +53,7 @@ public void undo_single() {
     }
     
     @Test
-    public void undo_multiple() {
+    public void undo_multiple_success() {
         console.runCommand(commandAdd1);
         assertTaskVisible(task1);
         console.runCommand(commandAdd2);
@@ -64,7 +64,7 @@ public void undo_multiple() {
     }
     
     @Test
-    public void undo_notavailable() {
+    public void undo_notAvailable_fail() {
         console.runCommand(commandAdd1);
         assertTaskVisible(task1);
         console.runCommand("undo");
@@ -76,13 +76,13 @@ public void undo_notavailable() {
     }
     
     @Test
-    public void undo_multiple_notavailable() {
+    public void undo_multipleNotAvailable_fail() {
         console.runCommand("undo 3");
         assertEquals(console.getConsoleTextArea(), "We cannot undo 3 commands! At most, you can undo 2 commands.");
     }
     
     @Test
-    public void redo_single() {
+    public void redo_single_success() {
         console.runCommand(commandAdd1);
         assertTaskVisible(task1);
         console.runCommand("undo");
@@ -92,7 +92,7 @@ public void redo_single() {
     }
     
     @Test
-    public void redo_multiple() {
+    public void redo_multiple_success() {
         console.runCommand(commandAdd1);
         assertTaskVisible(task1);
         console.runCommand(commandAdd2);
@@ -106,7 +106,7 @@ public void redo_multiple() {
     }
     
     @Test
-    public void redo_notavailable() {
+    public void redo_notAvailable_fail() {
         console.runCommand("redo");
         assertEquals(console.getConsoleTextArea(), "There is no command to redo!");
     }