diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 397441bf1..2771587c7 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -61,8 +61,9 @@ android {
 	productFlavors {
 		screenshot {
 			dimension "version"
-			minSdkVersion 18
+			minSdkVersion 21
 			applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-test.txt'
 		}
 		official {
 			dimension "version"
diff --git a/briar-android/proguard-test.txt b/briar-android/proguard-test.txt
index 91b89ae58..4e68fab04 100644
--- a/briar-android/proguard-test.txt
+++ b/briar-android/proguard-test.txt
@@ -1,3 +1,6 @@
+-keep,includedescriptorclasses class org.briarproject.bramble.** { *; }
+-keep,includedescriptorclasses class org.briarproject.briar.** { *; }
+
 -dontwarn android.test.**
 -dontwarn android.support.test.**
 -dontnote android.support.test.**