diff --git a/.travis.yml b/.travis.yml
index 1e54251c8d..7c50c68de9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: bash
 os: linux
-dist: trusty
+dist: bionic
 
 git:
   depth: 1
@@ -80,17 +80,13 @@ jobs:
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
       install:
-        - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo apt-get update -q
-        - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
         - sudo apt-get install valgrind lcov
-      env: CC=gcc-7 CXX=g++-7
 
     - name: "Docs"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
       install:
-          - sudo apt-get install python3-pip
+          - sudo apt-get install python3-pip python3-setuptools
           - pip3 install --user -r doc/requirements.txt;
 
     - name: "Style check"
@@ -101,11 +97,6 @@ jobs:
     - name: "Mock trivial test"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/buildm.sh
-      install:
-        - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo apt-get update -q
-        - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
-      env: CC=gcc-7 CXX=g++-7
 
     - name: "Mac OSX can build sketches"
       os: osx
diff --git a/tests/ci/style_check.sh b/tests/ci/style_check.sh
index a6b3532426..5cba58f9fa 100755
--- a/tests/ci/style_check.sh
+++ b/tests/ci/style_check.sh
@@ -9,6 +9,7 @@ ${org}/../restyle.sh
 
 # Revert changes which astyle might have done to the submodules,
 # as we don't want to fail the build because of the 3rd party libraries
-git submodule foreach --recursive git reset --hard
+git --version || true
+git submodule foreach --recursive 'git reset --hard'
 
 git diff --exit-code -- $TRAVIS_BUILD_DIR/libraries