diff --git a/.travis.yml b/.travis.yml
index 0f9d7ee..34cb4a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,4 +76,9 @@ script:
   - cd $TRAVIS_BUILD_DIR/../drupal
 
   # Run the tests
-  - drush test-run 'Typed Entity' --uri=http://localhost
+  - TEST_EXIT=$(drush test-run 'Typed Entity' --uri=http://localhost)
+  - cd $TRAVIS_BUILD_DIR/../drupal/sites/all/modules/typed_entity/tests
+  - ./run-tests.sh; TEST_PHPUNIT=$?
+
+  # Exit the build
+  - if [ $TEST_EXIT -eq 0 ] && [ $TEST_PHPUNIT -eq 0 ]; then exit 0; else exit 1; fi