diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 67a722cd7..700bb71d4 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -12,12 +12,21 @@ jobs:
                 vimtag: nightly
               - vimbin: vim
                 vimtag: v7.4.052
+                disable_es: true
               - vimbin: vim
                 vimtag: v7.4.629
+                disable_es: true
               - vimbin: vim
                 vimtag: v7.4.1689
+                disable_es: true
               - vimbin: vim
                 vimtag: v8.0.0027
+                disable_es: true
+              - vimbin: vim
+                vimtag: v8.0.0183
+                disable_es: true
+              - vimbin: vim
+                vimtag: v8.0.0184
               - vimbin: vim
                 vimtag: v8.0.1453
               - vimbin: vim
@@ -51,6 +60,7 @@ jobs:
         VIM_BIN: ${{ matrix.vimbin }}
         VIM_TAG: ${{ matrix.vimtag }}
         DEPS: /home/runner/work/SpaceVim/deps
+        DISABLE_ES: ${{ matrix.disable_es }}
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -70,6 +80,11 @@ jobs:
             export PATH="${DEPS}/_vim/${VIM_TAG}/bin:${PATH}"
             export VIM="${DEPS}/_vim/${VIM_TAG}/share/vim"
         fi
+        if [ "$DISABLE_ES" = "true" ]; then
+            export VIM_Es=""
+        else
+            export VIM_Es="-Es"
+        fi
         export PATH="/home/runner/.local/bin:${PATH}"
         echo "\$PATH: \"${PATH}\""
         echo "\$VIM: \"${VIM}\""
diff --git a/Makefile b/Makefile
index 2529e7ea1..917e0214b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 test: build/vader | build
-	$(VIM_BIN) -Nu test/vimrc -Es -c 'Vader! test/**'
+	$(VIM_BIN) -Nu test/vimrc $(VIM_Es) -c 'Vader! test/**'
 
 COVIMERAGE=$(shell command -v covimerage 2>/dev/null || echo build/covimerage/bin/covimerage)
 
 test_coverage: $(COVIMERAGE) build/vader | build
-	$(COVIMERAGE) run --source after  --source syntax --source autoload --source colors --source config --source ftplugin $(VIM_BIN) -Nu test/vimrc -Es -c 'Vader! test/**'
+	$(COVIMERAGE) run --source after  --source syntax --source autoload --source colors --source config --source ftplugin $(VIM_BIN) -Nu test/vimrc $(VIM_Es) -c 'Vader! test/**'
 
 $(COVIMERAGE):
-	$(COVIMERAGE) run --source after  --source syntax --source autoload --source colors --source config --source ftplugin $(VIM_BIN) -Nu test/vimrc -Es -c 'Vader! test/**'
+	$(COVIMERAGE) run --source after  --source syntax --source autoload --source colors --source config --source ftplugin $(VIM_BIN) -Nu test/vimrc $(VIM_Es) -c 'Vader! test/**'
 
 build/covimerage:
 	virtualenv $@