diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 97d5cfd7..6cb7acdd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         vim-version:
           - '--vim-80-only'
-          - '--vim-82-only'
+          - '--vim-90-only'
           - '--neovim-02-only'
           - '--neovim-07-only'
           - '--linters-only'
diff --git a/Dockerfile b/Dockerfile
index 7a1113f6..d5670387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM testbed/vim:20
 
 RUN install_vim -tag v8.0.0027 -build \
-                -tag v8.2.4693 -build \
+                -tag v9.0.0133 -build \
                 -tag neovim:v0.2.0 -build \
                 -tag neovim:v0.7.0 -build
 
diff --git a/run-tests b/run-tests
index 2439b623..a3c9b616 100755
--- a/run-tests
+++ b/run-tests
@@ -27,7 +27,7 @@ quiet_flag=''
 run_neovim_02_tests=1
 run_neovim_07_tests=1
 run_vim_80_tests=1
-run_vim_82_tests=1
+run_vim_90_tests=1
 run_linters=1
 
 while [ $# -ne 0 ]; do
@@ -42,7 +42,7 @@ while [ $# -ne 0 ]; do
     ;;
     --build-image)
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_neovim_02_tests=0
         run_neovim_07_tests=0
         run_linters=0
@@ -50,21 +50,21 @@ while [ $# -ne 0 ]; do
     ;;
     --neovim-only)
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_linters=0
         shift
     ;;
     --neovim-02-only)
         run_neovim_07_tests=0
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_linters=0
         shift
     ;;
     --neovim-07-only)
         run_neovim_02_tests=0
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_linters=0
         shift
     ;;
@@ -77,11 +77,10 @@ while [ $# -ne 0 ]; do
     --vim-80-only)
         run_neovim_02_tests=0
         run_neovim_07_tests=0
-        run_vim_82_tests=0
         run_linters=0
         shift
     ;;
-    --vim-82-only)
+    --vim-90-only)
         run_neovim_02_tests=0
         run_neovim_07_tests=0
         run_vim_80_tests=0
@@ -90,14 +89,14 @@ while [ $# -ne 0 ]; do
     ;;
     --linters-only)
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_neovim_02_tests=0
         run_neovim_07_tests=0
         shift
     ;;
     --fast)
         run_vim_80_tests=0
-        run_vim_82_tests=0
+        run_vim_90_tests=0
         run_neovim_02_tests=0
         run_neovim_07_tests=1
         shift
@@ -116,8 +115,8 @@ while [ $# -ne 0 ]; do
         echo '  --neovim-02-only  Run tests only for NeoVim 0.2'
         echo '  --neovim-07-only  Run tests only for NeoVim 0.7'
         echo '  --vim-only        Run tests only for Vim'
-        echo '  --vim-80-only     Run tests only for Vim 8.0'
-        echo '  --vim-82-only     Run tests only for Vim 8.2'
+        echo '  --vim-80-only     Run tests only for Vim 8.2'
+        echo '  --vim-90-only     Run tests only for Vim 9.0'
         echo '  --linters-only    Run only Vint and custom checks'
         echo '  --fast            Run only the fastest Vim and custom checks'
         echo '  --help            Show this help text'
@@ -218,7 +217,7 @@ trap cancel_tests INT TERM
 
 for vim in $(docker run --rm "$DOCKER_RUN_IMAGE" ls /vim-build/bin | grep '^neovim\|^vim' ); do
     if ( [[ $vim =~ ^vim-v8.0 ]] && ((run_vim_80_tests)) ) \
-    || ( [[ $vim =~ ^vim-v8.2 ]] && ((run_vim_82_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
         echo "Starting Vim: $vim..."