diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..9ef4b74
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+language: android
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-23.0.3
+    - android-23
+    - extra-android-support
+    - extra-android-m2repository
+    - extra-google-m2repository
+
+env:
+  global:
+   # install timeout in minutes (2 minutes by default)
+    - ADB_INSTALL_TIMEOUT=8
+
+# Emulator Management: Create, Start and Wait
+before_script:
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+
+script:
+  - android list target
+  - ./gradlew connectedAndroidTest
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ff2d4fa..ba0b5bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@
 
     defaultConfig {
         applicationId "masquerade.substratum"
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 23
         versionCode 12
         versionName "twelve"
@@ -34,4 +34,8 @@
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    dependencies {
+        testCompile 'junit:junit:4.12'
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/masquerade/substratum/util/Root.java b/app/src/main/java/masquerade/substratum/util/Root.java
index ccda162..6e398e1 100644
--- a/app/src/main/java/masquerade/substratum/util/Root.java
+++ b/app/src/main/java/masquerade/substratum/util/Root.java
@@ -34,8 +34,8 @@
     }
 
     public static void mount(boolean writeable, String mountpoint) {
-        runCommand(writeable ? "mount -o remount,rw " + mountpoint + " " + mountpoint :
-                "mount -o remount,ro " + mountpoint + " " + mountpoint);
+        runCommand(writeable ? "mount -o rw,remount " + mountpoint + " " + mountpoint :
+                "mount -o ro,remount " + mountpoint + " " + mountpoint);
     }
 
     public static void closeSU() {