diff --git a/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java b/library/common/src/test/java/com/google/android/exoplayer2/DeviceInfoTest.java
similarity index 92%
rename from library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/DeviceInfoTest.java
index 03ff4f833f..156887aaeb 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/DeviceInfoTest.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.device;
+package com.google.android.exoplayer2;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.DeviceInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java