diff --git a/tests/src/com/android/loganalysis/UnitTests.java b/tests/src/com/android/loganalysis/UnitTests.java
index 70c4bd3b00b40ce63443c61448393c5a20e39fa5..ac35a8a78df1d590c2134815382708064f2dc13c 100644
--- a/tests/src/com/android/loganalysis/UnitTests.java
+++ b/tests/src/com/android/loganalysis/UnitTests.java
@@ -17,9 +17,12 @@
 package com.android.loganalysis;
 
 import com.android.loganalysis.item.BatteryDischargeItemTest;
+import com.android.loganalysis.item.BatteryUsageItemTest;
+import com.android.loganalysis.item.DumpsysPackageStatsItemTest;
 import com.android.loganalysis.item.DvmLockSampleItemTest;
 import com.android.loganalysis.item.GenericItemTest;
 import com.android.loganalysis.item.InterruptItemTest;
+import com.android.loganalysis.item.LocationDumpsItemTest;
 import com.android.loganalysis.item.MemInfoItemTest;
 import com.android.loganalysis.item.MonkeyLogItemTest;
 import com.android.loganalysis.item.ProcrankItemTest;
@@ -28,25 +31,47 @@ import com.android.loganalysis.item.SystemPropsItemTest;
 import com.android.loganalysis.item.TopItemTest;
 import com.android.loganalysis.item.WakelockItemTest;
 import com.android.loganalysis.parser.AbstractSectionParserTest;
+import com.android.loganalysis.parser.ActivityServiceParserTest;
 import com.android.loganalysis.parser.AnrParserTest;
+import com.android.loganalysis.parser.BatteryDischargeStatsInfoParserTest;
+import com.android.loganalysis.parser.BatteryStatsDetailedInfoParserTest;
+import com.android.loganalysis.parser.BatteryStatsSummaryInfoParserTest;
+import com.android.loganalysis.parser.BatteryUsageParserTest;
 import com.android.loganalysis.parser.BugreportParserTest;
 import com.android.loganalysis.parser.CompactMemInfoParserTest;
+import com.android.loganalysis.parser.CpuInfoParserTest;
 import com.android.loganalysis.parser.DmesgParserTest;
+import com.android.loganalysis.parser.DumpsysBatteryStatsParserTest;
+import com.android.loganalysis.parser.DumpsysPackageStatsParserTest;
+import com.android.loganalysis.parser.DumpsysParserTest;
+import com.android.loganalysis.parser.DumpsysProcStatsParserTest;
+import com.android.loganalysis.parser.DumpsysWifiStatsParserTest;
 import com.android.loganalysis.parser.DvmLockSampleParserTest;
 import com.android.loganalysis.parser.EventsLogParserTest;
+import com.android.loganalysis.parser.GfxInfoParserTest;
 import com.android.loganalysis.parser.InterruptParserTest;
 import com.android.loganalysis.parser.JavaCrashParserTest;
 import com.android.loganalysis.parser.KernelLogParserTest;
+import com.android.loganalysis.parser.LocationServiceParserTest;
 import com.android.loganalysis.parser.LogcatParserTest;
+import com.android.loganalysis.parser.MemHealthParserTest;
 import com.android.loganalysis.parser.MemInfoParserTest;
 import com.android.loganalysis.parser.MonkeyLogParserTest;
 import com.android.loganalysis.parser.NativeCrashParserTest;
 import com.android.loganalysis.parser.ProcessUsageParserTest;
 import com.android.loganalysis.parser.ProcrankParserTest;
+import com.android.loganalysis.parser.QtaguidParserTest;
+import com.android.loganalysis.parser.SmartMonkeyLogParserTest;
 import com.android.loganalysis.parser.SystemPropsParserTest;
 import com.android.loganalysis.parser.TopParserTest;
+import com.android.loganalysis.parser.TraceFormatParserTest;
 import com.android.loganalysis.parser.TracesParserTest;
 import com.android.loganalysis.parser.WakelockParserTest;
+import com.android.loganalysis.rule.InterruptRuleTest;
+import com.android.loganalysis.rule.LocationUsageRuleTest;
+import com.android.loganalysis.rule.ProcessUsageRuleTest;
+import com.android.loganalysis.rule.WakelockRuleTest;
+import com.android.loganalysis.rule.WifiStatsRuleTest;
 import com.android.loganalysis.util.ArrayUtilTest;
 import com.android.loganalysis.util.LogPatternUtilTest;
 import com.android.loganalysis.util.LogTailUtilTest;
@@ -60,17 +85,21 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 /**
- * A test suite for all Trade Federation unit tests.
- * <p/>
- * All tests listed here should be self-contained, and should not require any external dependencies.
+ * A test suite for all log analysis unit tests.
+ *
+ * <p>All tests listed here should be self-contained, and should not require any external
+ * dependencies.
  */
 @RunWith(Suite.class)
 @SuiteClasses({
     // item
     BatteryDischargeItemTest.class,
+    BatteryUsageItemTest.class,
+    DumpsysPackageStatsItemTest.class,
     DvmLockSampleItemTest.class,
     GenericItemTest.class,
     InterruptItemTest.class,
+    LocationDumpsItemTest.class,
     MemInfoItemTest.class,
     MonkeyLogItemTest.class,
     ProcrankItemTest.class,
@@ -79,25 +108,49 @@ import org.junit.runners.Suite.SuiteClasses;
     TopItemTest.class,
     WakelockItemTest.class,
 
+    // rule
+    InterruptRuleTest.class,
+    LocationUsageRuleTest.class,
+    ProcessUsageRuleTest.class,
+    WakelockRuleTest.class,
+    WifiStatsRuleTest.class,
+
     // parser
     AbstractSectionParserTest.class,
+    ActivityServiceParserTest.class,
     AnrParserTest.class,
+    BatteryDischargeStatsInfoParserTest.class,
+    BatteryStatsDetailedInfoParserTest.class,
+    BatteryStatsSummaryInfoParserTest.class,
+    BatteryUsageParserTest.class,
     BugreportParserTest.class,
     CompactMemInfoParserTest.class,
+    CpuInfoParserTest.class,
     DmesgParserTest.class,
-    EventsLogParserTest.class,
+    DumpsysBatteryStatsParserTest.class,
+    DumpsysPackageStatsParserTest.class,
+    DumpsysParserTest.class,
+    DumpsysProcStatsParserTest.class,
+    DumpsysWifiStatsParserTest.class,
     DvmLockSampleParserTest.class,
+    EventsLogParserTest.class,
+    GfxInfoParserTest.class,
     InterruptParserTest.class,
     JavaCrashParserTest.class,
     KernelLogParserTest.class,
+    LocationServiceParserTest.class,
     LogcatParserTest.class,
+    MemHealthParserTest.class,
     MemInfoParserTest.class,
     MonkeyLogParserTest.class,
     NativeCrashParserTest.class,
     ProcessUsageParserTest.class,
     ProcrankParserTest.class,
+    QtaguidParserTest.class,
+    SmartMonkeyLogParserTest.class,
     SystemPropsParserTest.class,
     TopParserTest.class,
+    TraceFormatParserTest.class,
     TracesParserTest.class,
     WakelockParserTest.class,
 
@@ -114,4 +167,4 @@ import org.junit.runners.Suite.SuiteClasses;
 })
 public class UnitTests {
     // empty of purpose
-}
\ No newline at end of file
+}