diff --git a/core/core-spacemacs.el b/core/core-spacemacs.el
index f96a12ce7..880c09e07 100644
--- a/core/core-spacemacs.el
+++ b/core/core-spacemacs.el
@@ -22,6 +22,7 @@
 (require 'core-toggle)
 (require 'core-micro-state)
 (require 'core-use-package-ext)
+(require 'core-evilify-keymap)
 
 (defgroup spacemacs nil
   "Spacemacs customizations."
diff --git a/core/tests/core-evilify-keymap-ftest.el b/core/tests/core-evilify-keymap-ftest.el
index fe9dc2c7a..0d23d7817 100644
--- a/core/tests/core-evilify-keymap-ftest.el
+++ b/core/tests/core-evilify-keymap-ftest.el
@@ -11,7 +11,7 @@
 ;;; License: GPLv3
 (require 'mocker)
 (require 'core-funcs)
-(require 'core-evilified-state)
+(require 'core-evilify-keymap)
 (require 'core-spacemacs-buffer)
 
 ;; ---------------------------------------------------------------------------
diff --git a/core/tests/core-evilify-keymap-utest.el b/core/tests/core-evilify-keymap-utest.el
index d7fe37fb1..825ad2ab5 100644
--- a/core/tests/core-evilify-keymap-utest.el
+++ b/core/tests/core-evilify-keymap-utest.el
@@ -9,7 +9,7 @@
 ;; This file is not part of GNU Emacs.
 ;;
 ;;; License: GPLv3
-(require 'core-evilified-state)
+(require 'core-evilify-keymap)
 
 ;; ---------------------------------------------------------------------------
 ;; spacemacs//evilify-find-new-event