diff --git a/app/build.gradle b/app/build.gradle
index 1bac8399..44f50e4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 pmd {
-    toolVersion = '5.5.1'
+    toolVersion = '5.5.5'
 }
 
 dependencies {
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java
index ad5b8bb1..b4247cf2 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java
@@ -37,13 +37,24 @@ public class LanguageUtilsTest extends TestBase {
 
     @Test
     public void testTransliterateOption() throws Exception {
+        setDefaultTransliteration();
         assertFalse("Transliteration option fail! Expected 'Off' by default, but result is 'On'", LanguageUtils.transliterate());
 
-        SharedPreferences settings = GBApplication.getPrefs().getPreferences();
-        SharedPreferences.Editor editor = settings.edit();
-        editor.putBoolean("transliteration", true);
-        editor.apply();
-
+        enableTransliteration(true);
         assertTrue("Transliteration option fail! Expected 'On', but result is 'Off'", LanguageUtils.transliterate());
     }
+
+    private void setDefaultTransliteration() {
+        SharedPreferences settings = GBApplication.getPrefs().getPreferences();
+        SharedPreferences.Editor editor = settings.edit();
+        editor.remove("transliteration");
+        editor.apply();
+    }
+
+    private void enableTransliteration(boolean enable) {
+        SharedPreferences settings = GBApplication.getPrefs().getPreferences();
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean("transliteration", enable);
+        editor.apply();
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a3680365..cdb0e23b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip