diff --git a/services/tests/servicestests/src/com/android/server/BatteryServiceTest.java b/services/tests/servicestests/src/com/android/server/health/HealthServiceWrapperTest.java
similarity index 98%
rename from services/tests/servicestests/src/com/android/server/BatteryServiceTest.java
rename to services/tests/servicestests/src/com/android/server/health/HealthServiceWrapperTest.java
index a2ecbc30ec645..98c1e1c23de9e 100644
--- a/services/tests/servicestests/src/com/android/server/BatteryServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/health/HealthServiceWrapperTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server;
+package com.android.server.health;
 
 import static junit.framework.Assert.*;
 
@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.NoSuchElementException;
 
-public class BatteryServiceTest extends AndroidTestCase {
+public class HealthServiceWrapperTest extends AndroidTestCase {
 
     @Mock IServiceManager mMockedManager;
     @Mock IHealth mMockedHal;