diff --git a/F-Droid/test/src/mock/MockCategoryResources.java b/F-Droid/test/src/mock/MockCategoryResources.java
index 2662ec56a..0f88ade9f 100644
--- a/F-Droid/test/src/mock/MockCategoryResources.java
+++ b/F-Droid/test/src/mock/MockCategoryResources.java
@@ -12,14 +12,15 @@ public class MockCategoryResources extends MockFDroidResources {
 
     @Override
     public String getString(int id) {
-        if (id == R.string.category_All) {
-            return "All";
-        } else if (id == R.string.category_Recently_Updated) {
-            return "Recently Updated";
-        } else if (id == R.string.category_Whats_New) {
-            return "Whats New";
-        } else {
-            return "";
+        switch (id) {
+            case R.string.category_All:
+                return "All";
+            case R.string.category_Recently_Updated:
+                return "Recently Updated";
+            case R.string.category_Whats_New:
+                return "Whats New";
+            default:
+                return "";
         }
     }
 
diff --git a/F-Droid/test/src/mock/MockFDroidResources.java b/F-Droid/test/src/mock/MockFDroidResources.java
index 4122bacfd..b559bd83e 100644
--- a/F-Droid/test/src/mock/MockFDroidResources.java
+++ b/F-Droid/test/src/mock/MockFDroidResources.java
@@ -20,16 +20,17 @@ public class MockFDroidResources extends MockResources {
 
     @Override
     public int getInteger(int id) {
-        if (id == R.integer.fdroid_repo_inuse) {
-            return 1;
-        } else if (id == R.integer.fdroid_archive_inuse) {
-            return 0;
-        } else if (id == R.integer.fdroid_repo_priority) {
-            return 10;
-        } else if (id == R.integer.fdroid_archive_priority) {
-            return 20;
-        } else {
-            return 0;
+        switch (id) {
+            case R.integer.fdroid_repo_inuse:
+                return 1;
+            case R.integer.fdroid_archive_inuse:
+                return 0;
+            case R.integer.fdroid_repo_priority:
+                return 10;
+            case R.integer.fdroid_archive_priority:
+                return 20;
+            default:
+                return 0;
         }
     }