diff --git a/.travis.yml b/.travis.yml
index 02876ee59d25571ea8e1acaaaa2dc4f3700317e5..c5d6c9655ff6deba3bdc61341af3849a3064ab2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,15 @@ matrix:
       env: DB=pgsql
     - php: 5.4
       env: DB=mysql
+    - php: 5.4
+      env: DB=mysql EXTERNAL=true
   allow_failures:
     - php: hhvm
   fast_finish: true
 
 env:
+  global:
+    - EXTERNAL=false
   matrix:
     - DB=sqlite
 
@@ -36,6 +40,11 @@ before_script:
   # call setup for tests
   - build/prepareTests.sh $DB
 
+  # Enable/disable files_external to control it's unit test execution
+  - php occ --list
+  - if [[ $EXTERNAL == true ]] ; then php occ app:enable files_external ; fi
+  - if [[ $EXTERNAL == false ]] ; then php occ app:disable files_external ; fi
+
 script:
   - phpunit --version
   # Run PHP lint for each PHP version