diff --git a/.travis.yml b/.travis.yml
index fb5ba2d..3d136c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,23 @@ addons:
 
 script:
  - make
- - . mod.config;
+ - |
+   . mod.config;
    awk '/\r$$/ { exit(1); }' mod.config || (printf "Invalid mod.config format. File must be saved using unix-style (CR, not CRLF) line endings.\n"; travis_terminate 1);
-   if [ "${TRAVIS_TEST_MOD}" == "True" ]; then make test || travis_terminate 1; fi;
-   if [ "${TRAVIS_TEST_PACKAGING}" == "True" ]; then make check-packaging-scripts && ./packaging/package-all.sh test-0 || travis_terminate 1; fi
+   if [ "${TRAVIS_TEST_MOD}" == "True" ]; then
+     make test || travis_terminate 1;
+   fi;
+   if [ "${TRAVIS_TEST_PACKAGING}" == "True" ] || [ -n "${TRAVIS_TAG}" ]; then
+     wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.03-2_all.deb || travis_terminate 1;
+     wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.03-2_amd64.deb || travis_terminate 1;
+     sudo dpkg -i nsis-common_3.03-2_all.deb || travis_terminate 1;
+     sudo dpkg -i nsis_3.03-2_amd64.deb || travis_terminate 1;
+   fi
+   if [ "${TRAVIS_TEST_PACKAGING}" == "True" ] && [ -z "${TRAVIS_TAG}" ]; then
+     make check-packaging-scripts && ./packaging/package-all.sh test-0 || travis_terminate 1;
+   fi
 
 before_deploy:
- - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.03-2_all.deb
- - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.03-2_amd64.deb
- - sudo dpkg -i nsis-common_3.03-2_all.deb
- - sudo dpkg -i nsis_3.03-2_amd64.deb
  - mkdir build
  - make check-packaging-scripts && cd build && ../packaging/package-all.sh ${TRAVIS_TAG} ${PWD} && cd ..