diff --git a/build.gradle b/build.gradle
index d6f8b249d..157d0ccc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,26 @@
-ext.jadxVersion = file('version').readLines().get(0)
-version = jadxVersion
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+}
+
+plugins {
+    id "com.github.kt3k.coveralls" version "2.0.1"
+    id "info.solidsoft.pitest" version "1.1.1"
+//    id "com.github.ben-manes.versions" version "0.6"
+}
 
 apply plugin: 'sonar-runner'
 
+ext.jadxVersion = file('version').readLines().get(0)
+version = jadxVersion
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'groovy'
     apply plugin: 'jacoco'
-    apply plugin: 'coveralls'
+    apply plugin: 'com.github.kt3k.coveralls'
 
     version = jadxVersion
 
@@ -32,7 +45,7 @@ subprojects {
 
         testCompile 'ch.qos.logback:logback-classic:1.1.2'
         testCompile 'junit:junit:4.11'
-        testCompile 'org.mockito:mockito-core:1.10.10'
+        testCompile 'org.mockito:mockito-core:1.10.13'
         testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
         testCompile 'cglib:cglib-nodep:3.1'
     }
@@ -50,15 +63,12 @@ subprojects {
     }
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        // setup coveralls (http://coveralls.io/) see http://github.com/kt3k/coveralls-gradle-plugin
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.6.1'
-    }
+/* Sonar runner configuration */
+repositories {
+    mavenCentral()
+}
+sonarRunner {
+    toolVersion = '2.4'
 }
 
 task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installApp', 'jadx-gui:installApp']) {
@@ -81,13 +91,17 @@ task dist(dependsOn: pack) {
 task samples(dependsOn: 'jadx-samples:samples') {
 }
 
-task build(dependsOn: [dist, samples]) {
+task pitest(overwrite: true, dependsOn: 'jadx-core:pitest') {
 }
 
-task clean(type: Delete) {
+task cleanBuildDir(type: Delete) {
     delete buildDir
 }
 
+build.dependsOn(dist, samples)
+
+clean.dependsOn(cleanBuildDir)
+
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '2.2.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0087cd3b1..2322723c7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e00c175bc..e11cafccc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
index ae5c24446..cb845706a 100644
--- a/jadx-core/build.gradle
+++ b/jadx-core/build.gradle
@@ -1,5 +1,7 @@
 ext.jadxClasspath = 'clsp-data/android-4.3.jar'
 
+apply plugin: "info.solidsoft.pitest"
+
 dependencies {
     runtime files(jadxClasspath)
 
@@ -15,3 +17,10 @@ task packTests(type: Jar) {
     from sourceSets.test.output
 }
 
+pitest {
+    excludedMethods = ['toString']
+    threads = 4
+    enableDefaultIncrementalAnalysis = true
+    outputFormats = ['XML', 'HTML']
+    jvmArgs = ['-Xmx12G']
+}
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 40e75bccc..867e3662b 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compile(project(":jadx-core"))
     compile(project(":jadx-cli"))
     compile 'com.fifesoft:rsyntaxtextarea:2.5.0'
-    compile 'com.google.code.gson:gson:2.3'
+    compile 'com.google.code.gson:gson:2.3.1'
 }
 
 applicationDistribution.with {