diff --git a/.travis.yml b/.travis.yml
index 7e5879a..3349313 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,7 +110,7 @@ matrix:
         COMPILER_C="gcc"
         COMPILER_CXX="g++"
         REPOSITORY="https://github.com/RXT0112/Zernit.git"
-        PACKAGES="rustc cargo git make pkg-config libssl-dev"
+        PACKAGES="rustc cargo build-essentials"
 
     - name: "Debian Sid with Clang"
       os: linux
@@ -123,7 +123,7 @@ matrix:
         COMPILER_C="clang"
         COMPILER_CXX="clang++"
         REPOSITORY="https://github.com/RXT0112/Zernit.git"
-        PACKAGES="rustc cargo git make pkg-config libssl-dev"
+        PACKAGES="rustc cargo build-essentials"
 
   # # FreeBSD
   #   # FreeBSD 12.0-RELEASE
@@ -159,6 +159,8 @@ matrix:
       osx_image: xcode11.2
       compiler: clang
       group: travis_latest
+      env:
+        TOOL="build"
 
     - name: "MacOS 10.14, xcode11.2 with gcc"
       os: osx
@@ -167,6 +169,8 @@ matrix:
       osx_image: xcode11.2
       compiler: gcc
       group: travis_latest
+      env:
+        TOOL="build"
 
     ## MacOS 10.14.4
     - name: "MacOS 10.14.4, xcode10.3 with clang"
@@ -176,6 +180,8 @@ matrix:
       osx_image: xcode10.3
       compiler: clang
       group: travis_latest
+      env:
+        TOOL="build"
 
     - name: "MacOS 10.14.4, xcode10.3 with gcc"
       os: osx
@@ -184,6 +190,8 @@ matrix:
       osx_image: xcode10.3
       compiler: gcc
       group: travis_latest
+      env:
+        TOOL="build"
 
     ## MacOS 10.13
     - name: "MacOS 10.13, xcode9.4 with clang"
@@ -193,6 +201,8 @@ matrix:
       osx_image: xcode9.4
       compiler: clang
       group: travis_latest
+      env:
+        TOOL="build"
 
     - name: "MacOS 10.13, xcode9.4 with gcc"
       os: osx
@@ -201,6 +211,8 @@ matrix:
       osx_image: xcode9.4
       compiler: gcc
       group: travis_latest
+      env:
+        TOOL="build"
 
   # Others
     # Default linux
diff --git a/QA/travis-ci/install.sh b/QA/travis-ci/install.sh
index 2ae4c5f..f2281d1 100755
--- a/QA/travis-ci/install.sh
+++ b/QA/travis-ci/install.sh
@@ -27,7 +27,7 @@ if [ "$TRAVIS_OS_NAME" = linux ] && [ -z "$DOCKER" ] && [ -z "$QEMU" ]; then
 
 	# Install dependencies based on variant used
 	case "$VARIANT" in
-		ubuntu-19.10)
+		ubuntu-*|debian-*)
 			# Install dependencies
 			if [ -n "$PACKAGES" ]; then
 				sudo apt install -y "$PACKAGES" || die 1 "Unable to install following packages: '$PACKAGES'"
@@ -73,9 +73,16 @@ elif [ "$TRAVIS_OS_NAME" = linux ] && [ -n "$DOCKER" ] && [ -z "$QEMU" ]; then
 elif [ "$TRAVIS_OS_NAME" = osx ]; then
 	# Homebrew takes lots of time on runtime due to the cleanup used, this is a hotfix (https://travis-ci.community/t/macosx-brew-update-takes-too-much-time/6295)
 	HOMEBREW_NO_INSTALL_CLEANUP=1 brew update || die "Unable to update brew"
-    
+
 	info "Installing dependencies"
-	brew install shellcheck cppcheck shfmt || die "Unable to install dependencies on $TRAVIS_OS_NAME"
+
+	if [ -n "$PACKAGES" ]; then
+		brew install $PACKAGES || die "Unable to install dependencies on $TRAVIS_OS_NAME"
+	elif [ -z "$PACKAGES" ]; then
+		true
+	else
+		die 256 "Unexpected happend while installing packages on '$TRAVIS_OS_NAME'"
+	fi
 
 # FreeBSD via QEMU
 elif [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$QEMU" = "FreeBSD" ]; then