diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index 914c9e7b68..7a04c735c0 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -43,24 +43,11 @@
         <ignore path="**/src/debug/**" />
     </issue>
 
-    <issue id="UnusedResources" severity="warning">
+    <issue id="UnusedResources" severity="error">
         <!-- Ignore unused strings resource from localazy -->
         <ignore path="**/localazy.xml" />
         <!-- Ignore unused resource in debug build type -->
         <ignore path="**/src/debug/**" />
-
-        <!-- Following resources are for F-Droid variant only, so ignore for GPlay -->
-        <ignore regexp="settings_troubleshoot_test_service_boot_*" />
-        <ignore regexp="settings_troubleshoot_test_bg_restricted_*" />
-        <ignore regexp="settings_troubleshoot_test_battery_*" />
-
-        <!-- Following resources are for GPlay variant only, so ignore for F-Droid -->
-        <ignore regexp="settings_troubleshoot_test_play_services_" />
-        <ignore regexp="settings_troubleshoot_test_push_loop_" />
-        <ignore regexp="settings_troubleshoot_test_token_registration_" />
-        <ignore regexp="settings_troubleshoot_test_fcm_" />
-        <ignore regexp="no_valid_google_play_services_apk" />
-        <ignore regexp="sas_error_unknown" />
     </issue>
 
     <!-- UX -->