diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34e611eaa..f106ca44d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,9 +23,13 @@ jobs:
     timeout-minutes: 10
 
     strategy:
+
+      # Nightly can often fail as it is a moving target so disable fail-fast so
+      # we can always see if the over versions pass or not.
+      fail-fast: false
+
       matrix:
         neovim_branch:
-          - 'v0.8.3'
           - 'v0.9.5'
           - 'v0.10.0'
           - 'nightly'
diff --git a/Makefile b/Makefile
index b02fbb111..bea1ecea9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ export PJ_ROOT=$(PWD)
 
 FILTER ?= .*
 
-export NVIM_RUNNER_VERSION := v0.9.5
-export NVIM_TEST_VERSION ?= v0.9.5
+export NVIM_RUNNER_VERSION := v0.10.0
+export NVIM_TEST_VERSION ?= v0.10.0
 
 ifeq ($(shell uname -s),Darwin)
     UNAME ?= MACOS
@@ -30,8 +30,8 @@ test: nvim-test
 
 .PHONY: test-all
 test-all:
-	$(MAKE) test NVIM_TEST_VERSION=v0.8.3
 	$(MAKE) test NVIM_TEST_VERSION=v0.9.5
+	$(MAKE) test NVIM_TEST_VERSION=v0.10.0
 	$(MAKE) test NVIM_TEST_VERSION=nightly
 
 export XDG_DATA_HOME ?= $(HOME)/.data
diff --git a/README.md b/README.md
index cdf91ab68..ad7764e89 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Super fast git decorations implemented purely in Lua.
 
 ## Requirements
 
-- Neovim >= 0.8.0
+- Neovim >= 0.9.0
 
   **Note:** If your version of Neovim is too old, then you can use a past [release].
 
diff --git a/doc/gitsigns.txt b/doc/gitsigns.txt
index ddc1b2991..4393273a2 100644
--- a/doc/gitsigns.txt
+++ b/doc/gitsigns.txt
@@ -955,17 +955,17 @@ searching for other defined highlights in order.
 GitSignsAdd
         Used for the text of 'add' signs.
 
-        Fallbacks: `GitGutterAdd`, `SignifySignAdd`, `DiffAddedGutter`, `diffAdded`, `DiffAdd`
+        Fallbacks: `GitGutterAdd`, `SignifySignAdd`, `DiffAddedGutter`, `Added`, `DiffAdd`
                                                         *hl-GitSignsChange*
 GitSignsChange
         Used for the text of 'change' signs.
 
-        Fallbacks: `GitGutterChange`, `SignifySignChange`, `DiffModifiedGutter`, `diffChanged`, `DiffChange`
+        Fallbacks: `GitGutterChange`, `SignifySignChange`, `DiffModifiedGutter`, `Changed`, `DiffChange`
                                                         *hl-GitSignsDelete*
 GitSignsDelete
         Used for the text of 'delete' signs.
 
-        Fallbacks: `GitGutterDelete`, `SignifySignDelete`, `DiffRemovedGutter`, `diffRemoved`, `DiffDelete`
+        Fallbacks: `GitGutterDelete`, `SignifySignDelete`, `DiffRemovedGutter`, `Removed`, `DiffDelete`
                                                         *hl-GitSignsChangedelete*
 GitSignsChangedelete
         Used for the text of 'changedelete' signs.
diff --git a/test/gitsigns_spec.lua b/test/gitsigns_spec.lua
index d6597c0c3..df57eb72c 100644
--- a/test/gitsigns_spec.lua
+++ b/test/gitsigns_spec.lua
@@ -85,9 +85,6 @@ describe('gitsigns (with screen)', function()
 
   it('gitdir watcher works on a fresh repo', function()
     local nvim_ver = exec_lua('return vim.version().minor')
-    if nvim_ver == 8 then
-      pending("v0.8.0 has some regression that's fixed it v0.9.0 dev")
-    end
     screen:try_resize(20, 6)
     setup_test_repo({ no_add = true })
     -- Don't set this too low, or else the test will lock up
@@ -110,7 +107,7 @@ describe('gitsigns (with screen)', function()
 
     check({
       status = { head = '', added = 18, changed = 0, removed = 0 },
-      signs = { untracked = nvim_ver == 10 and 7 or 8 },
+      signs = { untracked = nvim_ver == 9 and 8 or 7 },
     })
 
     git({ 'add', test_file })