diff --git a/.travis.yml b/.travis.yml
index 8c00b0a16..3260a07cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 jdk: oraclejdk7
-script: mvn install -Dmaven.test.skip=true
-# -DreleaseTesting
+script: mvn install -DreleaseTesting
 
 env:
   global:
@@ -12,6 +11,6 @@ before_install:
   - wget -O ~/codacy-coverage-reporter-assembly.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/1.0.13/codacy-coverage-reporter-1.0.13-assembly.jar
 
 after_success:
+  - java -cp ~/codacy-coverage-reporter-assembly.jar com.codacy.CodacyCoverageReporter -l Java -r build-reporting/target/coverage-reports/jacoco.xml
   - chmod +x coverity_scan.sh
   - ./coverity_scan.sh
-#  - java -cp ~/codacy-coverage-reporter-assembly.jar com.codacy.CodacyCoverageReporter -l Java -r build-reporting/target/coverage-reports/jacoco.xml
diff --git a/coverity_scan.sh b/coverity_scan.sh
index a83d6b76d..368af917a 100644
--- a/coverity_scan.sh
+++ b/coverity_scan.sh
@@ -1,13 +1,12 @@
-
+#!/bin/bash -e
 
 if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_EVENT_TYPE = "cron" ] ; then
   echo "Executing Coverity Scan"
-fi
-    
-export COVERITY_SCAN_PROJECT_NAME="jeremylong/DependencyCheck"
-export COVERITY_SCAN_NOTIFICATION_EMAIL="jeremy.long@owasp.org"
-export COVERITY_SCAN_BRANCH_PATTERN="master"
-export COVERITY_SCAN_BUILD_COMMAND="mvn package -Dmaven.test.skip=true"
+  
+  export COVERITY_SCAN_PROJECT_NAME="jeremylong/DependencyCheck"
+  export COVERITY_SCAN_NOTIFICATION_EMAIL="jeremy.long@owasp.org"
+  export COVERITY_SCAN_BRANCH_PATTERN="master"
+  export COVERITY_SCAN_BUILD_COMMAND="mvn package -Dmaven.test.skip=true"
 
-# Run the Coverity scan
-curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | bash
\ No newline at end of file
+  curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | bash
+fi
\ No newline at end of file