diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java
index 6919b0479..7e7b27d77 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java
@@ -13,6 +13,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class ApkProviderHelperTest extends BaseApkProviderTest {
 
     public void testKnownApks() {
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java
index 2ec82cffe..922b69639 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java
@@ -14,6 +14,7 @@ import org.fdroid.fdroid.mock.MockRepo;
 import java.util.ArrayList;
 import java.util.List;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class ApkProviderTest extends BaseApkProviderTest {
 
     /**
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java
index fa3d55957..81f0e5a22 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java
@@ -17,6 +17,7 @@ import mock.MockCategoryResources;
 import mock.MockContextSwappableComponents;
 import mock.MockInstallablePackageManager;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class AppProviderTest extends FDroidProviderTest<AppProvider> {
 
     public AppProviderTest() {
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java
index 76a803fdb..e9f9e9517 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java
@@ -22,6 +22,7 @@ import mock.MockContextEmptyComponents;
 import mock.MockContextSwappableComponents;
 import mock.MockFDroidResources;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public abstract class FDroidProviderTest<T extends FDroidProvider> extends ProviderTestCase2MockContext<T> {
 
     private FDroidProvider[] allProviders = {
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java b/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java
index 73d6188de..53be0b601 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java
@@ -10,6 +10,7 @@ import org.fdroid.fdroid.data.SanitizedFile;
 import java.io.File;
 import java.util.UUID;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class FileCompatTest extends InstrumentationTestCase {
 
     private static final String TAG = "FileCompatTest";
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java
index 840972e17..0af7acde9 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java
@@ -10,6 +10,7 @@ import mock.MockInstallablePackageManager;
  * For practical reasons, it extends FDroidProviderTest<InstalledAppProvider>, although there is also a
  * separate test for the InstalledAppProvider which tests the CRUD operations in more detail.
  */
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvider> {
 
     private MockInstallablePackageManager packageManager;
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java
index 21386d660..1613eecb5 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java
@@ -9,6 +9,7 @@ import org.fdroid.fdroid.data.RepoProvider;
 
 import mock.MockInstallablePackageManager;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class InstalledAppProviderTest extends FDroidProviderTest<InstalledAppProvider> {
 
     private MockInstallablePackageManager packageManager;
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
index b6f1e6c81..04978533e 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
@@ -28,6 +28,7 @@ import java.io.File;
 import java.util.List;
 import java.util.UUID;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class MultiRepoUpdaterTest extends InstrumentationTestCase {
     private static final String TAG = "RepoUpdaterTest";
 
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
index b8d755724..8aa99a9e1 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java
@@ -9,6 +9,7 @@ import org.fdroid.fdroid.data.Repo;
 
 import java.io.File;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class RepoUpdaterTest extends InstrumentationTestCase {
     private static final String TAG = "RepoUpdaterTest";
 
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
index 37df10d49..dcbb8bd43 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
@@ -24,6 +24,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class RepoXMLHandlerTest extends AndroidTestCase {
     private static final String TAG = "RepoXMLHandlerTest";
 
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java b/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java
index 0c84550fd..6a9a9068b 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java
@@ -6,6 +6,7 @@ import org.fdroid.fdroid.data.SanitizedFile;
 
 import java.io.File;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class SanitizedFileTest extends AndroidTestCase {
 
     public void testSanitizedFile() {
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java b/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java
index 270f89fb6..7e4265f56 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java
@@ -3,6 +3,7 @@ package org.fdroid.fdroid;
 
 import android.test.AndroidTestCase;
 
+@SuppressWarnings("PMD")  // TODO port this to JUnit 4 semantics
 public class UtilsTest extends AndroidTestCase {
 
     String fdroidFingerprint = "43238D512C1E5EB2D6569F4A3AFBF5523418B82E0A3ED1552770ABB9A9C9CCAB";