diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6cb7acdd..4910a5ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
           - '--vim-80-only'
           - '--vim-90-only'
           - '--neovim-02-only'
-          - '--neovim-07-only'
+          - '--neovim-08-only'
           - '--linters-only'
     steps:
       - uses: actions/checkout@v2
diff --git a/Dockerfile b/Dockerfile
index d5670387..b7b42a3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM testbed/vim:20
+FROM testbed/vim:24
 
 RUN install_vim -tag v8.0.0027 -build \
                 -tag v9.0.0133 -build \
                 -tag neovim:v0.2.0 -build \
-                -tag neovim:v0.7.0 -build
+                -tag neovim:v0.8.0 -build
 
 ENV PACKAGES="\
     bash \
diff --git a/doc/ale-development.txt b/doc/ale-development.txt
index a24d4caa..0f06642c 100644
--- a/doc/ale-development.txt
+++ b/doc/ale-development.txt
@@ -156,8 +156,8 @@ environments.
 1. Vim 8.0.0027 on Linux via GitHub Actions.
 2. Vim 9.0.0133 on Linux via GitHub Actions.
 3. NeoVim 0.2.0 on Linux via GitHub Actions.
-4. NeoVim 0.7.0 on Linux via GitHub Actions.
-6. Vim 9 (stable builds) on Windows via AppVeyor.
+4. NeoVim 0.8.0 on Linux via GitHub Actions.
+6. Vim 8 (stable builds) on Windows via AppVeyor.
 
 If you are developing ALE code on Linux, Mac OSX, or BSD, you can run ALEs
 tests by installing Docker and running the `run-tests` script. Follow the
diff --git a/run-tests b/run-tests
index a3c9b616..41460fc5 100755
--- a/run-tests
+++ b/run-tests
@@ -20,12 +20,12 @@ git_version=$(git describe --always --tags)
 DOCKER_RUN_IMAGE="$image:$image_tag"
 export DOCKER_RUN_IMAGE
 
-tests='test/*.vader test/*/*.vader test/*/*/*.vader test/*/*/*.vader'
+tests='test/*.vader test/*/*.vader test/*/*/*.vader'
 # These flags are forwarded to the script for running Vader tests.
 verbose_flag=''
 quiet_flag=''
 run_neovim_02_tests=1
-run_neovim_07_tests=1
+run_neovim_08_tests=1
 run_vim_80_tests=1
 run_vim_90_tests=1
 run_linters=1
@@ -44,7 +44,7 @@ while [ $# -ne 0 ]; do
         run_vim_80_tests=0
         run_vim_90_tests=0
         run_neovim_02_tests=0
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
         run_linters=0
         shift
     ;;
@@ -55,13 +55,13 @@ while [ $# -ne 0 ]; do
         shift
     ;;
     --neovim-02-only)
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
         run_vim_80_tests=0
         run_vim_90_tests=0
         run_linters=0
         shift
     ;;
-    --neovim-07-only)
+    --neovim-08-only)
         run_neovim_02_tests=0
         run_vim_80_tests=0
         run_vim_90_tests=0
@@ -70,19 +70,20 @@ while [ $# -ne 0 ]; do
     ;;
     --vim-only)
         run_neovim_02_tests=0
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
         run_linters=0
         shift
     ;;
     --vim-80-only)
         run_neovim_02_tests=0
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
+        run_vim_90_tests=0
         run_linters=0
         shift
     ;;
     --vim-90-only)
         run_neovim_02_tests=0
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
         run_vim_80_tests=0
         run_linters=0
         shift
@@ -91,14 +92,14 @@ while [ $# -ne 0 ]; do
         run_vim_80_tests=0
         run_vim_90_tests=0
         run_neovim_02_tests=0
-        run_neovim_07_tests=0
+        run_neovim_08_tests=0
         shift
     ;;
     --fast)
         run_vim_80_tests=0
         run_vim_90_tests=0
         run_neovim_02_tests=0
-        run_neovim_07_tests=1
+        run_neovim_08_tests=1
         shift
     ;;
     --help)
@@ -113,7 +114,7 @@ while [ $# -ne 0 ]; do
         echo '  --build-image     Run docker image build only.'
         echo '  --neovim-only     Run tests only for NeoVim'
         echo '  --neovim-02-only  Run tests only for NeoVim 0.2'
-        echo '  --neovim-07-only  Run tests only for NeoVim 0.7'
+        echo '  --neovim-08-only  Run tests only for NeoVim 0.8'
         echo '  --vim-only        Run tests only for Vim'
         echo '  --vim-80-only     Run tests only for Vim 8.2'
         echo '  --vim-90-only     Run tests only for Vim 9.0'
@@ -219,7 +220,7 @@ for vim in $(docker run --rm "$DOCKER_RUN_IMAGE" ls /vim-build/bin | grep '^neov
     if ( [[ $vim =~ ^vim-v8.0 ]] && ((run_vim_80_tests)) ) \
     || ( [[ $vim =~ ^vim-v9.0 ]] && ((run_vim_90_tests)) ) \
     || ( [[ $vim =~ ^neovim-v0.2 ]] && ((run_neovim_02_tests)) ) \
-    || ( [[ $vim =~ ^neovim-v0.7 ]] && ((run_neovim_07_tests)) ); then
+    || ( [[ $vim =~ ^neovim-v0.8 ]] && ((run_neovim_08_tests)) ); then
         echo "Starting Vim: $vim..."
         file_number=$((file_number+1))
         test/script/run-vader-tests $quiet_flag $verbose_flag "$vim" "$tests" \