diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/CacheDataSourceContractTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java
similarity index 92%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/CacheDataSourceContractTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java
index 360bc37c59..e16ef98056 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/CacheDataSourceContractTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream;
+package com.google.android.exoplayer2.upstream.cache;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
@@ -23,9 +23,7 @@ import com.google.android.exoplayer2.testutil.DataSourceContractTest;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
-import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
-import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import java.io.File;