diff --git a/.travis.yml b/.travis.yml
index 40a7b55..771dddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,22 @@
 language: android
 jdk: oraclejdk8
-before_script:
-  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-  - emulator -avd test -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
+
+env:
+  matrix:
+    - ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a
+
 android:
   components:
-    - tools
+    - tools # to get the new `repository-11.xml`
+    - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
     - platform-tools
     - build-tools-28.0.3
     - android-28
-    - extra-android-support
-    - extra-android-m2repository
-    - extra-google-m2repository
 
   licenses:
     - '.+'
+
+before_install:
+  - yes | sdkmanager "platforms;android-28"
+script:
+  - ./gradlew build connectedCheck
diff --git a/app/build.gradle b/app/build.gradle
index 7e04aaf..6b0bbbe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,7 @@ android {
 
   buildTypes {
     debug {
+      ext.enableCrashlytics = false
       buildConfigField "String", "FABRIC_API_KEY", "\"\""
     }
     release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b68a968..332578e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,9 +50,6 @@
       </intent-filter>
     </receiver>
 
-    <meta-data
-        android:name="io.fabric.ApiKey"
-        android:value="${fabricKey}"/>
     <meta-data
         android:name="preloaded_fonts"
         android:resource="@array/preloaded_fonts"/>
diff --git a/app/src/release/AndroidManifest.xml b/app/src/release/AndroidManifest.xml
new file mode 100644
index 0000000..f557bb7
--- /dev/null
+++ b/app/src/release/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.afollestad.nocknock">
+
+  <application>
+
+    <meta-data
+        android:name="io.fabric.ApiKey"
+        android:value="${fabricKey}"/>
+
+  </application>
+
+</manifest>
diff --git a/dependencies.gradle b/dependencies.gradle
index ee87cb2..b6b8781 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,8 +3,8 @@ ext.versions = [
     minSdk              : 21,
     compileSdk          : 28,
     buildTools          : '28.0.3',
-    publishVersion      : '0.8.4',
-    publishVersionCode  : 37,
+    publishVersion      : '0.8.5',
+    publishVersionCode  : 39,
 
     // Plugins
     gradlePlugin        : '3.2.1',