diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index c7998ad79b34..253007fe5cc0 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -224,6 +224,9 @@
       <property name="allowEmptyLoopBody" value="true"/>
     </module>
 
+    <!-- Checks that each variable declaration is in its own statement and on its own line. -->
+    <module name="MultipleVariableDeclarations"/>
+
     <module name="OneStatementPerLine"/>
 
     <module name="UpperEll">
diff --git a/src/test/java/seedu/address/commons/core/VersionTest.java b/src/test/java/seedu/address/commons/core/VersionTest.java
index 96a12a723ca6..c3014d633d27 100644
--- a/src/test/java/seedu/address/commons/core/VersionTest.java
+++ b/src/test/java/seedu/address/commons/core/VersionTest.java
@@ -51,7 +51,8 @@ public void versionToString_validVersion_correctStringRepresentation() {
 
     @Test
     public void versionComparable_validVersion_compareToIsCorrect() {
-        Version one, another;
+        Version one;
+        Version another;
 
         // Tests equality
         one = new Version(0, 0, 0, true);
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index e805f958ebae..aef2ad72fb4a 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -24,40 +24,39 @@
  */
 public class TypicalPersons {
 
-    public static final ReadOnlyPerson ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE, HOON, IDA, AMY, BOB;
-    public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
+    public static final ReadOnlyPerson ALICE = new PersonBuilder().withName("Alice Pauline")
+            .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
+            .withPhone("85355255")
+            .withTags("friends").build();
+    public static final ReadOnlyPerson BENSON = new PersonBuilder().withName("Benson Meier")
+            .withAddress("311, Clementi Ave 2, #02-25")
+            .withEmail("johnd@example.com").withPhone("98765432")
+            .withTags("owesMoney", "friends").build();
+    public static final ReadOnlyPerson CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
+            .withEmail("heinz@example.com").withAddress("wall street").build();
+    public static final ReadOnlyPerson DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
+            .withEmail("cornelia@example.com").withAddress("10th street").build();
+    public static final ReadOnlyPerson ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
+            .withEmail("werner@example.com").withAddress("michegan ave").build();
+    public static final ReadOnlyPerson FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
+            .withEmail("lydia@example.com").withAddress("little tokyo").build();
+    public static final ReadOnlyPerson GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
+            .withEmail("anna@example.com").withAddress("4th street").build();
 
-    static {
-        ALICE = new PersonBuilder().withName("Alice Pauline")
-                .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
-                .withPhone("85355255")
-                .withTags("friends").build();
-        BENSON = new PersonBuilder().withName("Benson Meier").withAddress("311, Clementi Ave 2, #02-25")
-                .withEmail("johnd@example.com").withPhone("98765432")
-                .withTags("owesMoney", "friends").build();
-        CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
-                .withEmail("heinz@example.com").withAddress("wall street").build();
-        DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
-                .withEmail("cornelia@example.com").withAddress("10th street").build();
-        ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
-                .withEmail("werner@example.com").withAddress("michegan ave").build();
-        FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
-                .withEmail("lydia@example.com").withAddress("little tokyo").build();
-        GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
-                .withEmail("anna@example.com").withAddress("4th street").build();
+    // Manually added
+    public static final ReadOnlyPerson HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
+            .withEmail("stefan@example.com").withAddress("little india").build();
+    public static final ReadOnlyPerson IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
+            .withEmail("hans@example.com").withAddress("chicago ave").build();
 
-        // Manually added
-        HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
-                .withEmail("stefan@example.com").withAddress("little india").build();
-        IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
-                .withEmail("hans@example.com").withAddress("chicago ave").build();
+    // Manually added - Person's details found in {@code CommandTestUtil}
+    public static final ReadOnlyPerson AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
+            .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
+    public static final ReadOnlyPerson BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
+            .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
+            .build();
 
-        // Manually added - Person's details found in {@code CommandTestUtil}
-        AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY)
-                .withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
-        BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
-    }
+    public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
 
     private TypicalPersons() {} // prevents instantiation