diff --git a/.travis.yml b/.travis.yml
index f105a9cc14..a0c3e8f406 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,34 @@
 ---
 language: java
-script: mvn -q clean install -P examples
+script: mvn -q install -P examples
 jdk:
+- openjdk6
 - openjdk7
-- oraclejdk7
 matrix:
   include:
-  - jdk: openjdk6
-    script: mvn -q clean deploy --settings .travis-settings.xml -Dno.gem.deploy=true
+  - jdk: oraclejdk7
+    script: mvn -q deploy -p android --settings .travis-settings.xml -Dno.gem.deploy=true -Dandroid.device=test
+    before_install:
+      # Install base Android SDK
+      - sudo apt-get update -qq
+      - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
+      - wget http://dl.google.com/android/android-sdk_r21.1-linux.tgz
+      - tar xzf android-sdk_r21.1-linux.tgz
+      - export ANDROID_HOME=$PWD/android-sdk-linux
+      - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+
+      # Install required components.
+      # For a full list, run `android list sdk -a --extended`
+      # Note that sysimg-16 downloads the ARM, x86 and MIPS images (we should optimize this).
+      # Other relevant APIs:
+      #  addon-google_apis-google-16
+      - android update sdk --filter platform-tools,extra-android-support,android-8 --no-ui --force > /dev/null
+
+      # Create and start emulator
+      - echo no | android create avd --force -n test -t android-8 --abi armeabi
+      - emulator -avd test -no-skin -no-audio -no-window &
+    before_script:
+      - ./android/wait_for_emulator
 branches:
   only:
   - master
diff --git a/pom.xml b/pom.xml
index 38281951d3..2f766b4797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,8 +390,6 @@
     </pluginRepositories>
 
     <modules>
-        <module>android</module>
-        <module>android-test</module>
         <module>core</module>
         <module>picocontainer</module>
         <module>clojure</module>
@@ -411,6 +409,14 @@
     </modules>
 
     <profiles>
+        <profile>
+            <id>android</id>
+            <modules>
+                <module>android</module>
+                <module>android-test</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>examples</id>
             <modules>