diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f1209a1a7..4f3260663 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2.0.0
-        
+
       - name: Set up Python 3.6
         uses: actions/setup-python@v2
         with:
@@ -158,19 +158,21 @@ jobs:
           env
 
           pip3 install --user -U \
-          -r requirements.txt \
-          -r contrib/pyln-client/requirements.txt \
-          -r contrib/pyln-proto/requirements.txt \
-          -r contrib/pyln-testing/requirements.txt
-
-          # Install utilities that aren't dependencies, but make running
-          # tests easier/feasible on CI
-          pip3 install --user \
-          blinker \
-          pytest-sentry \
-          pytest-rerunfailures==9.1.1 \
-          pytest-test-groups==1.0.3 \
-          pytest-custom-exit-code==0.3.0
+            -r requirements.txt \
+            -r contrib/pyln-client/requirements.txt \
+            -r contrib/pyln-proto/requirements.txt \
+            -r contrib/pyln-testing/requirements.txt
+
+          # Install utilities that aren't dependencies, but make
+          # running tests easier/feasible on CI (and pytest which
+          # keeps breaking the rerunfailures plugin).
+          pip3 install --user -U \
+            pytest==6.1.0 \
+            blinker \
+            pytest-sentry \
+            pytest-rerunfailures==9.1.1 \
+            pytest-test-groups==1.0.3 \
+            pytest-custom-exit-code==0.3.0
 
           git clone https://github.com/lightningnetwork/lightning-rfc.git ../lightning-rfc
 
@@ -183,46 +185,57 @@ jobs:
 
           if [ "$TARGET_HOST" == "arm-linux-gnueabihf" ] || [ "$TARGET_HOST" == "aarch64-linux-gnu" ]
           then
-          export QEMU_LD_PREFIX=/usr/"$TARGET_HOST"/
-          export MAKE_HOST="$TARGET_HOST"
-          export BUILD=x86_64-pc-linux-gnu
-          export AR="$TARGET_HOST"-ar
-          export AS="$TARGET_HOST"-as
-          export CC="$TARGET_HOST"-gcc
-          export CXX="$TARGET_HOST"-g++
-          export LD="$TARGET_HOST"-ld
-          export STRIP="$TARGET_HOST"-strip
-          export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static
-
-          wget -q https://zlib.net/zlib-1.2.11.tar.gz \
-          && tar xf zlib-1.2.11.tar.gz \
-          && cd zlib-1.2.11 \
-          && ./configure --prefix="$QEMU_LD_PREFIX" \
-          && make \
-          && sudo make install
-          cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11
-
-          wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip \
-          && unzip -q sqlite-src-3260000.zip \
-          && cd sqlite-src-3260000 \
-          && automake --add-missing --force-missing --copy || true \
-          && ./configure --disable-tcl --enable-static --disable-readline --disable-threadsafe --disable-load-extension --host="$TARGET_HOST" --prefix="$QEMU_LD_PREFIX" \
-          && make \
-          && sudo make install
-          cd .. && rm sqlite-src-3260000.zip && rm -rf sqlite-src-3260000
-
-          wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz \
-          && tar xf gmp-6.1.2.tar.xz \
-          && cd gmp-6.1.2 \
-          && ./configure --disable-assembly --prefix="$QEMU_LD_PREFIX" --host="$TARGET_HOST" \
-          && make \
-          && sudo make install
-          cd .. && rm gmp-6.1.2.tar.xz && rm -rf gmp-6.1.2
-
-          ./configure CC="$TARGET_HOST-gcc" --enable-static
-
-          make -j32 CC="$TARGET_HOST-gcc" > /dev/null
+            export QEMU_LD_PREFIX=/usr/"$TARGET_HOST"/
+            export MAKE_HOST="$TARGET_HOST"
+            export BUILD=x86_64-pc-linux-gnu
+            export AR="$TARGET_HOST"-ar
+            export AS="$TARGET_HOST"-as
+            export CC="$TARGET_HOST"-gcc
+            export CXX="$TARGET_HOST"-g++
+            export LD="$TARGET_HOST"-ld
+            export STRIP="$TARGET_HOST"-strip
+            export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static
+
+            wget -q https://zlib.net/zlib-1.2.11.tar.gz
+            tar xf zlib-1.2.11.tar.gz
+            cd zlib-1.2.11
+            ./configure --prefix="$QEMU_LD_PREFIX"
+            make
+            sudo make install
+            cd ..
+            rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11
+
+            wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip
+            unzip -q sqlite-src-3260000.zip
+            cd sqlite-src-3260000
+            automake --add-missing --force-missing --copy || true
+            ./configure --disable-tcl \
+              --enable-static \
+              --disable-readline \
+              --disable-threadsafe \
+              --disable-load-extension \
+              --host="$TARGET_HOST" \
+              --prefix="$QEMU_LD_PREFIX"
+            make
+            sudo make install
+            cd ..
+            rm sqlite-src-3260000.zip
+            rm -rf sqlite-src-3260000
+
+            wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz
+            tar xf gmp-6.1.2.tar.xz
+            cd gmp-6.1.2
+            ./configure --disable-assembly --prefix="$QEMU_LD_PREFIX" --host="$TARGET_HOST"
+            make
+            sudo make install
+            cd ..
+            rm gmp-6.1.2.tar.xz
+            rm -rf gmp-6.1.2
+
+            ./configure CC="$TARGET_HOST-gcc" --enable-static
+
+            make -j32 CC="$TARGET_HOST-gcc" > /dev/null
           else
-          eatmydata make -j32
-          eatmydata $TEST_CMD
+            eatmydata make -j32
+            eatmydata $TEST_CMD
           fi