diff --git a/.travis.yml b/.travis.yml
index 4be7cf3..b298ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 # We still need android to get the build tools/support libraries
 language: android
+android:
+  components:
+    - build-tools-21.1.1
+    - android-21
+    - extra-android-support
+    - extra-google-m2repository
 
 script:
   - ./gradlew test
diff --git a/app/build.gradle b/app/build.gradle
index 51a0f26..f8ca179 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,8 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
-    }
 }
 
-apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
@@ -44,8 +40,9 @@ dependencies {
     compile 'com.squareup.dagger:dagger:+'
     provided 'com.squareup.dagger:dagger-compiler:+'
 
-    compile 'de.devland.esperandro:esperandro-api:+'
-    provided 'de.devland.esperandro:esperandro:+'
+    // TODO: Figure out why I need to force 2.1.0 and can't just use +
+    compile 'de.devland.esperandro:esperandro-api:2.1.0'
+    provided 'de.devland.esperandro:esperandro:2.1.0'
 
     compile 'com.jakewharton:butterknife:+'
     compile 'com.readystatesoftware.systembartint:systembartint:+'