diff --git a/.travis.yml b/.travis.yml
index bcc5f39624..0cf9fd9144 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,21 @@
 language: csharp
 mono: 3.12.0
 
-# Don't use the container based infrastructure
-sudo: true
+# http://docs.travis-ci.com/user/migrating-from-legacy
+sudo: false
 
 cache:
   directories:
   - thirdparty/download
 
+addons:
+  apt:
+    packages:
+    - nsis
+    - nsis-common
+    - dpkg
+    - markdown
+
 # Environment variables
 env:
   secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
@@ -20,7 +28,6 @@ env:
 # Check source code with StyleCop
 # call OpenRA to check for YAML errors
 script:
- - sudo apt-get remove nuget # https://github.com/travis-ci/travis-ci/issues/3940
  - travis_retry make all-dependencies
  - make all
  - make check
@@ -50,7 +57,6 @@ notifications:
     skip_join: true
 
 before_deploy:
- - sudo apt-get install nsis nsis-common dpkg markdown
  - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh
index 2ea6192d4b..37450feb7b 100755
--- a/thirdparty/fetch-thirdparty-deps.sh
+++ b/thirdparty/fetch-thirdparty-deps.sh
@@ -13,7 +13,8 @@ download_dir="${0%/*}/download"
 mkdir -p "${download_dir}"
 cd "${download_dir}"
 
-if which nuget >/dev/null 2>&1; then
+# https://github.com/travis-ci/travis-ci/issues/3940
+if [ ! $TRAVIS ] && which nuget >/dev/null 2>&1; then
 	get()
 	{
 		nuget install $1 -Version $2 -ExcludeVersion