diff --git a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
index 2f039654ca7e9..58cdb1b79d836 100644
--- a/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
@@ -53,7 +53,6 @@ import com.android.server.policy.WindowManagerPolicy;
 import com.android.server.power.batterysaver.BatterySaverController;
 import com.android.server.power.batterysaver.BatterySaverPolicy;
 import com.android.server.power.batterysaver.BatterySavingStats;
-import com.android.server.power.stats.BatteryStatsImpl;
 import com.android.server.statusbar.StatusBarManagerInternal;
 
 import org.junit.Before;
@@ -78,7 +77,6 @@ public class NotifierTest {
     @Mock private AmbientDisplayConfiguration mAmbientDisplayConfigurationMock;
     @Mock private SystemPropertiesWrapper mSystemPropertiesMock;
     @Mock private InattentiveSleepWarningController mInattentiveSleepWarningControllerMock;
-    @Mock private BatteryStatsImpl mBatteryStats;
     @Mock private Vibrator mVibrator;
     @Mock private StatusBarManagerInternal mStatusBarManagerInternal;
 
diff --git a/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
index fe6cc28f03d3c..67ed6b740c4b9 100644
--- a/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
@@ -366,7 +366,7 @@ public class ShutdownCheckPointsTest {
     }
 
     /** Fake system dependencies for testing. */
-    private final class TestInjector implements ShutdownCheckPoints.Injector {
+    private static final class TestInjector implements ShutdownCheckPoints.Injector {
         private long mNow;
         private int mCheckPointsLimit;
         private int mDumpFilesLimit;
diff --git a/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
index 7af4b3d87a3af..0fad25d35515b 100644
--- a/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
@@ -424,7 +424,7 @@ public class WakeLockLogTest {
         return sw.toString();
     }
 
-    public class TestInjector extends WakeLockLog.Injector {
+    public static class TestInjector extends WakeLockLog.Injector {
         private final int mTagDatabaseSize;
         private final int mLogSize;