diff --git a/autoload/SpaceVim/logger.vim b/autoload/SpaceVim/logger.vim
index 3f46f0e91..342603470 100644
--- a/autoload/SpaceVim/logger.vim
+++ b/autoload/SpaceVim/logger.vim
@@ -6,7 +6,7 @@
 " License: GPLv3
 "=============================================================================
 
-if $SPACEVIM_LUA && has('nvim-0.5.0')
+if has('lua') || has('nvim-0.5.0')
   function! SpaceVim#logger#info(msg) abort
     lua require("spacevim.logger").info(
           \ require("spacevim").eval("a:msg")
diff --git a/autoload/SpaceVim/plugins/a.vim b/autoload/SpaceVim/plugins/a.vim
index cd1112754..f35f2a13c 100644
--- a/autoload/SpaceVim/plugins/a.vim
+++ b/autoload/SpaceVim/plugins/a.vim
@@ -11,7 +11,7 @@ set cpo&vim
 scriptencoding utf-8
 
 
-if $SPACEVIM_LUA && has('nvim-0.5.0')
+if has('lua') || has('nvim-0.5.0')
   function! SpaceVim#plugins#a#alt(request_parse, ...) abort
     lua require("spacevim.plugin.a").alt(
           \ require("spacevim").eval("a:request_parse"),
diff --git a/autoload/SpaceVim/plugins/projectmanager.vim b/autoload/SpaceVim/plugins/projectmanager.vim
index b8c13988d..d9dd33711 100644
--- a/autoload/SpaceVim/plugins/projectmanager.vim
+++ b/autoload/SpaceVim/plugins/projectmanager.vim
@@ -8,7 +8,7 @@
 
 
 
-if $SPACEVIM_LUA && has('nvim-0.5.0')
+if has('lua') || has('nvim-0.5.0')
   function! SpaceVim#plugins#projectmanager#complete_project(ArgLead, CmdLine, CursorPos) abort
     return luaeval('require("spacevim.plugin.projectmanager").complete('
           \ .'require("spacevim").eval("a:ArgLead"),'
diff --git a/test/lua/data/string.vader b/test/lua/data/string.vader
index 9192d6c07..33f64c21e 100644
--- a/test/lua/data/string.vader
+++ b/test/lua/data/string.vader
@@ -1,5 +1,5 @@
 Execute ( SpaceVim lua api: data#string ):
-  if $SPACEVIM_LUA != 1
+  if !has('lua') && !has('nvim-0.5.0')
     finish
   endif
   let cmp = SpaceVim#api#import('vim#compatible')