diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bc57ef60..3aa566480 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160706
+image: mvdan/fdroid-ci:client-20160709
 
 cache:
   paths:
@@ -47,12 +47,12 @@ connected10:
     - exit $EXITVALUE
   allow_failure: true  # remove once install segfaults are gone
 
-connected23:
+connected24:
   variables:
-    AVD_SDK: "23"
+    AVD_SDK: "24"
   script:
     - export GRADLE_USER_HOME=$PWD/.gradle
-    - emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
+    - emulator64-x86 -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
     - export EXITVALUE=0
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index 247ac29ef..407ad7998 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -10,12 +10,12 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.0'
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1050
         versionName "0.1"
     }
diff --git a/app/build.gradle b/app/build.gradle
index 04bdf542a..381e47366 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -139,8 +139,8 @@ if (!hasProperty('sourceDeps')) {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.0'
     useLibrary 'org.apache.http.legacy'
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 41acae8d8..aef660433 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="23"
+        android:targetSdkVersion="24"
         />
 
     <supports-screens
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
index bd451cec1..ef79897fa 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
@@ -92,6 +92,6 @@ public class DefaultInstaller extends Installer {
     @Override
     protected boolean supportsContentUri() {
         // Android N only supports content Uris
-        return Build.VERSION.SDK_INT >= 24; // TODO: Use Build.VERSION_CODES.N
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
     }
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
index 000bbbf2b..18defb767 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
@@ -79,11 +79,11 @@ public class DefaultInstallerActivity extends FragmentActivity {
             throw new RuntimeException("Set the data uri to point to an apk location!");
         }
         // https://code.google.com/p/android/issues/detail?id=205827
-        if ((Build.VERSION.SDK_INT < 24) // TODO: Use Build.VERSION_CODES.N
+        if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
                 && (!uri.getScheme().equals("file"))) {
             throw new RuntimeException("PackageInstaller < Android N only supports file scheme!");
         }
-        if ((Build.VERSION.SDK_INT >= 24) // TODO: Use Build.VERSION_CODES.N
+        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 && (!uri.getScheme().equals("content"))) {
             throw new RuntimeException("PackageInstaller >= Android N only supports content scheme!");
         }
@@ -103,7 +103,7 @@ public class DefaultInstallerActivity extends FragmentActivity {
             intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
             intent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true);
             intent.putExtra(Intent.EXTRA_ALLOW_REPLACE, true);
-        } else if (Build.VERSION.SDK_INT < 24) { // TODO: Use Build.VERSION_CODES.N
+        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             intent.setAction(Intent.ACTION_INSTALL_PACKAGE);
             intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
             intent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true);
diff --git a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
index 00d3d889c..d0f7b9f13 100644
--- a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
@@ -19,7 +19,8 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
     private static final String TAG = "AcceptableMultiRepoTest";
diff --git a/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
index 27cc720a6..ac1056331 100644
--- a/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java
@@ -38,7 +38,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class RepoXMLHandlerTest {
     private static final String TAG = "RepoXMLHandlerTest";
diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
index 7f2da9f77..1f73046b8 100644
--- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
@@ -15,7 +15,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class UtilsTest {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
index fcbdf38e5..b0aac5a04 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
@@ -31,7 +31,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ApkProviderTest extends FDroidProviderTest {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
index 546d17eb2..170710365 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
@@ -27,7 +27,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class AppProviderTest extends FDroidProviderTest {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
index 592ad1a46..148c59544 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
@@ -23,7 +23,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class InstalledAppProviderTest extends FDroidProviderTest {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java
index 945b5f646..5534a72bd 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java
@@ -20,7 +20,8 @@ import java.util.List;
 import static org.fdroid.fdroid.Assert.assertInvalidUri;
 import static org.fdroid.fdroid.Assert.assertValidUri;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ProviderUriTests {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java b/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
index 13ca70fea..7d9d26620 100644
--- a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
@@ -13,7 +13,8 @@ import java.io.IOException;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ApkCacheTest {
 
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index d0da67120..14c92c636 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '23.0.2'
+    buildToolsVersion '24.0.0'
 
     defaultConfig {
         minSdkVersion 7
diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle
index ef9bd8b99..5d267c599 100644
--- a/privileged-api-lib/build.gradle
+++ b/privileged-api-lib/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.0'
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }