diff --git a/.travis.yml b/.travis.yml
index c4f4389457..ea02d9fb53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
 language: haskell
 ghc: 7.8
 script:
-  - cabal configure --enable-tests --enable-library-coverage -v2 && cabal build && cabal test
+  - ./travis-script.sh
 after_script:
-  - cabal install hpc-coveralls
-  - hpc-coveralls --exclude-dir=tests tests
+  - ./travis-after-script.sh
 notifications:
   email: true
 before_deploy: "./bundle/build.sh linux64"
diff --git a/travis-after-script.sh b/travis-after-script.sh
new file mode 100755
index 0000000000..ceeaec0203
--- /dev/null
+++ b/travis-after-script.sh
@@ -0,0 +1,7 @@
+set -e
+
+if [ -z $( git describe --tags --exact-match 2>/dev/null ) ]
+then
+  cabal install hpc-coveralls
+  hpc-coveralls --exclude-dir=tests tests
+fi
diff --git a/travis-script.sh b/travis-script.sh
new file mode 100755
index 0000000000..54c06bb85a
--- /dev/null
+++ b/travis-script.sh
@@ -0,0 +1,11 @@
+set -e
+
+if [ -z $( git describe --tags --exact-match 2>/dev/null ) ]
+then
+  cabal configure --enable-tests --enable-library-coverage -v2
+else
+  cabal configure --enable-tests -v2
+fi
+
+cabal build
+cabal test