diff --git a/.travis.yml b/.travis.yml
index 90eefe6232d..4376e21a75b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,22 @@ jobs:
     - stage: verify
       env: PURPOSE='SourceStatic'
       script: ./scripts/ci/test_static.sh
-      python: 3.6
+      python: 2.7
     - stage: verify
       env: PURPOSE='SourceStatic'
       script: ./scripts/ci/test_static.sh
+      python: 3.6
+    - stage: verify
+      env: PURPOSE='SourceTests'
+      script: python ./scripts/ci/test_source.sh
       python: 2.7
     - stage: verify
-      env: PURPOSE='IndexVerify'
-      script: python ./scripts/ci/test_index.py -v
+      env: PURPOSE='SourceTests'
+      script: python ./scripts/ci/test_source.sh
       python: 3.6
     - stage: verify
       env: PURPOSE='IndexVerify'
       script: python ./scripts/ci/test_index.py -v
-      python: 2.7
+      python: 3.6
+  allow_failures:
+    - env: PURPOSE='SourceTests'
diff --git a/scripts/ci/test_source.sh b/scripts/ci/test_source.sh
new file mode 100755
index 00000000000..98dfad2cca9
--- /dev/null
+++ b/scripts/ci/test_source.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -e
+
+for d in src/*/azext_*/tests;
+    do echo "Running tests for $d";
+    python -m unittest discover -v $d;
+done;