diff --git a/.ci/travis-compile.sh b/.ci/travis-compile.sh
index 2d647962..039c6c09 100644
--- a/.ci/travis-compile.sh
+++ b/.ci/travis-compile.sh
@@ -54,43 +54,7 @@ done
 
 # Check formatting using clang-format
 if [[ $CHECK_FORMAT ]]; then
-  echo "Checking your code using clang-format..."
-  diff="$(./clangify.sh --diff --cf-version)"
-  err=$?
-  case $err in
-    1)
-      cat <<EOM
-***********************************************************
-***                                                     ***
-***    Your code does not comply with our styleguide.   ***
-***                                                     ***
-***  Please correct it or run the "clangify.sh" script. ***
-***  Then commit and push those changes to this branch. ***
-***   Check our CONTRIBUTING.md file for more details.  ***
-***                                                     ***
-***                     Thank you ♥                     ***
-***                                                     ***
-***********************************************************
-
-Used clang-format version:
-${diff%%
-*}
-
-The following changes should be made:
-${diff#*
-}
-
-Exiting...
-EOM
-      exit 2
-      ;;
-    0)
-      echo "Thank you for complying with our code standards."
-      ;;
-    *)
-      echo "Something went wrong in our formatting checks: clangify returned $err" >&2
-      ;;
-  esac
+  source ./.ci/travis-lint.sh
 fi
 
 set -e
diff --git a/.ci/travis-lint.sh b/.ci/travis-lint.sh
new file mode 100644
index 00000000..cd5e6ed5
--- /dev/null
+++ b/.ci/travis-lint.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Check formatting using clang-format
+echo "Checking your code using clang-format..."
+diff="$(./clangify.sh --diff --cf-version)"
+err=$?
+case $err in
+  1)
+    cat <<EOM
+***********************************************************
+***                                                     ***
+***    Your code does not comply with our styleguide.   ***
+***                                                     ***
+***  Please correct it or run the "clangify.sh" script. ***
+***  Then commit and push those changes to this branch. ***
+***   Check our CONTRIBUTING.md file for more details.  ***
+***                                                     ***
+***                     Thank you ♥                     ***
+***                                                     ***
+***********************************************************
+Used clang-format version:
+${diff%%
+*}
+The following changes should be made:
+${diff#*
+}
+Exiting...
+EOM
+      exit 2
+      ;;
+    0)
+      echo "Thank you for complying with our code standards."
+      ;;
+    *)
+      echo "Something went wrong in our formatting checks: clangify returned $err" >&2
+      ;;
+  esac
diff --git a/.travis.yml b/.travis.yml
index 2119de19..bad12e10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,32 +7,16 @@ git:
 matrix:
   include:
 
-  #Ubuntu Xenial (Debug only)
-  - name: Ubuntu Xenial (Debug)
+  #Static Code Analysis
+  - name: Check code style / Linting
     if: tag IS NOT present
     os: linux
-    dist: xenial
     group: stable
-    cache: ccache
-    addons:
-      apt:
-        packages:
-        - libprotobuf-dev
-        - protobuf-compiler
-        - liblzma-dev
-        - qt5-default
-        - qttools5-dev
-        - qttools5-dev-tools
-        - qtmultimedia5-dev
-        - libqt5multimedia5-plugins
-        - libqt5svg5-dev
-        - libqt5sql5-mysql
-        - libqt5websockets5-dev
-    script: bash ./.ci/travis-compile.sh --format --server --test --debug
+    script: bash ./.ci/travis-lint.sh
 
 
-  #Ubuntu Bionic (on docker)
-  - name: Ubuntu Bionic (Debug)
+  #Ubuntu Bionic (on Docker)
+  - name: Ubuntu Bionic (Debug + Tests)
     if: tag IS NOT present
     services: docker
     env: NAME=UbuntuBionic
@@ -43,7 +27,7 @@ matrix:
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src"
           --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
           "cockatrice_${NAME,,}"
-          bash .ci/travis-compile.sh --server --debug
+          bash .ci/travis-compile.sh --server --test --debug
 
   - name: Ubuntu Bionic (Release)
     if: (branch = master AND NOT type = pull_request) OR tag IS present