diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 642b4e30..04b94995 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -123,59 +123,7 @@ jobs:
         stack test --system-ghc
 
   ghcjs:
-    name: ubuntu-18.04 / ghcjs 8.4
-    runs-on: "ubuntu-18.04"
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: "Setup PATH"
-      run: |
-        echo "PATH=$HOME/.cabal/bin:/opt/ghcjs/8.4/bin:$PATH" >> $GITHUB_ENV
-
-    - name: Install ghcjs and cabal
-      run: |
-        # Default GitHub image dropped ppa:hvr/ghc, so we add it ourselves
-        sudo add-apt-repository ppa:hvr/ghc
-        sudo add-apt-repository ppa:hvr/ghcjs
-        sudo apt-get update -y
-        sudo apt-get install ghcjs-8.4
-        sudo apt-get install cabal-install
-
-        # Override cabal.project with the lightweight GHCJS one
-        cp cabal.ghcjs.project cabal.project
-        cat cabal.project
-
-    - name: Cabal update and freeze
-      run: |
-        cabal v2-update
-        cabal v2-freeze
-
-    - uses: actions/cache@v2.1.3
-      name: Cache ~/.cabal/store and dist-newstyle
-      with:
-        path: |
-          ~/.cabal/store
-          dist-newstyle
-        key: ubuntu-18.04-ghcjs8.4-${{ hashFiles('cabal.project.freeze') }}
-        restore-keys: |
-          ubuntu-18.04-ghcjs8.4-
-
-    - name: Install cabal-plan and hspec-discover
-      run: |
-        cabal v2-install -w /opt/ghc/8.4.4/bin/ghc --ignore-project cabal-plan --constraint='cabal-plan ^>=0.6.0.0' --constraint='cabal-plan +exe'
-        cabal v2-install -w /opt/ghc/8.4.4/bin/ghc --ignore-project hspec-discover
-
-    - name: Build
-      run: |
-        cabal v2-build --ghcjs -w /opt/ghcjs/8.4/bin/ghcjs --enable-tests --enable-benchmarks all
-
-    - name: Run tests
-      run: |
-        cabal-plan list-bins '*:test:*' | while read -r line; do testpkg=$(echo "$line" | perl -pe 's/:.*//'); testexe=$(echo "$line" | awk '{ print $2 }'); echo "testing $textexe in package $textpkg"; (cd "$(pkgdir $testpkg)" && nodejs "$testexe".jsexe/all.js); done
-
-  ghcjs-test:
-    name: ghcjs-test
+    name: ubuntu-latest / ghcjs 8.6
     runs-on: "ubuntu-latest"
 
     steps: