diff --git a/app/build.gradle b/app/build.gradle
index 86f844e3b..fd3df6a8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,6 @@ buildscript {
   dependencies {
     classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
     classpath "com.testdroid:gradle:$testdroidGradlePluginVersion"
-    classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
   }
 }
 
@@ -68,7 +67,7 @@ dependencies {
     exclude group: 'com.android.support', module: 'recyclerview-v7'
   }
 
-  androidTestImplementation('com.schibsted.spain:barista:2.4.0') {
+  androidTestImplementation("com.schibsted.spain:barista:$baristaVersion") {
     exclude group: 'com.android.support'
   }
 
@@ -104,7 +103,7 @@ dependencies {
   implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
   implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
   implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
-  implementation('com.squareup.retrofit2:converter-simplexml:2.1.0') {
+  implementation("com.squareup.retrofit2:converter-simplexml:$retrofitVersion") {
     exclude group: 'xpp3', module: 'xpp3'
     exclude group: 'stax', module: 'stax-api'
     exclude group: 'stax', module: 'stax'
@@ -124,13 +123,13 @@ dependencies {
   androidTestImplementation "junit:junit:$jUnitVersion"
 
   // Mockito
-  testImplementation "org.mockito:mockito-core:2.8.9"
-  androidTestImplementation "org.mockito:mockito-android:2.7.22"
+  testImplementation "org.mockito:mockito-core:$mockitoVersion"
+  androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
 
   // PowerMockito
-  testImplementation 'org.powermock:powermock:1.6.5'
-  testImplementation 'org.powermock:powermock-module-junit4:1.7.3'
-  testImplementation 'org.powermock:powermock-api-mockito2:1.7.3'
+  testImplementation "org.powermock:powermock:$powerMockVersion"
+  testImplementation "org.powermock:powermock-module-junit4:$powerMockJUnitVersion"
+  testImplementation "org.powermock:powermock-api-mockito2:$powerMockJUnitVersion"
 
   // Leak canary
   implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
diff --git a/build.gradle b/build.gradle
index 4121528d4..898199bc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,10 +15,10 @@ ext {
   androidGradlePluginVersion = '3.1.3'
   testdroidGradlePluginVersion = '2.49.1'
   supportLibraryVersion = '27.1.1'
-  rxJavaVersion = '2.1.9'
+  rxJavaVersion = '2.1.16'
   rxAndroidVersion = '2.0.2'
-  okHttpVersion = '3.9.1'
-  retrofitVersion = '2.3.0'
+  okHttpVersion = '3.11.0'
+  retrofitVersion = '2.4.0'
   javaxAnnotationVersion = '1.3.2'
   daggerVersion = '2.16'
   inkPageIndicatorVersion = '1.3.0'
@@ -28,6 +28,10 @@ ext {
   apacheCommonsVersion = '2.6'
   multidexVersion = '1.0.3'
   jUnitVersion = '4.12'
+  mockitoVersion = '2.19.1'
+  powerMockVersion = '1.6.6'
+  powerMockJUnitVersion = '1.7.4'
+  baristaVersion = '2.5.0'
 }
 
 allprojects {