diff --git a/build.gradle b/build.gradle
index de8a48a..c52f076 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
-apply from: 'buildsrc/dependencies.gradle'
+apply from: 'buildsystem/ci.gradle'
+apply from: 'buildsystem/dependencies.gradle'
 
 buildscript {
   repositories {
diff --git a/buildsystem/ci.gradle b/buildsystem/ci.gradle
new file mode 100644
index 0000000..d634f62
--- /dev/null
+++ b/buildsystem/ci.gradle
@@ -0,0 +1,13 @@
+def ciServer = 'TRAVIS'
+def executingOnCI = "true".equals(System.getenv(ciServer))
+
+// Since for CI we always do full clean builds, we don't want to pre-dex
+// See http://tools.android.com/tech-docs/new-build-system/tips
+subprojects {
+  project.plugins.whenPluginAdded { plugin ->
+    if ('com.android.build.gradle.AppPlugin'.equals(plugin.class.name) ||
+        'com.android.build.gradle.LibraryPlugin'.equals(plugin.class.name)) {
+      project.android.dexOptions.preDexLibraries = !executingOnCI
+    }
+  }
+}
diff --git a/buildsrc/dependencies.gradle b/buildsystem/dependencies.gradle
similarity index 100%
rename from buildsrc/dependencies.gradle
rename to buildsystem/dependencies.gradle