diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index a62c9d8bf..ae103ee18 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -7,8 +7,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.media.MediaMetadataRetriever;
 import android.os.Binder;
 import android.os.Build;
@@ -1107,7 +1105,7 @@ public class DownloadService extends Service {
      * that every image reference is unique.
      */
     @VisibleForTesting
-    public static void removeDuplicateImages(Feed feed) {
+    static void removeDuplicateImages(Feed feed) {
         Set<String> known = new HashSet<>();
         for (FeedItem item : feed.getItems()) {
             String url = item.hasItemImage() ? item.getImage().getDownload_url() : null;
diff --git a/core/src/androidTest/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java b/core/src/test/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java
similarity index 89%
rename from core/src/androidTest/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java
rename to core/src/test/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java
index ee27f6bbd..e40de2064 100644
--- a/core/src/androidTest/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/service/download/DownloadServiceTest.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.core.service.download;
 
-import android.test.AndroidTestCase;
+
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,8 +10,11 @@ import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 
-public class DownloadServiceTest extends AndroidTestCase {
+import static org.junit.Assert.assertEquals;
 
+public class DownloadServiceTest  {
+
+    @Test
     public void testRemoveDuplicateImages() {
         List<FeedItem> items = new ArrayList<>();
         for (int i = 0; i < 50; i++) {