diff --git a/tools/emacs/gyp-tests.el b/tools/emacs/gyp-tests.el
index 11b84978..07afc58a 100644
--- a/tools/emacs/gyp-tests.el
+++ b/tools/emacs/gyp-tests.el
@@ -30,7 +30,7 @@
   "For the purposes of face comparison, we're not interested in the
    differences between certain faces. For example, the difference between
    font-lock-comment-delimiter and font-lock-comment-face."
-  (case face
+  (cl-case face
     ((font-lock-comment-delimiter-face) font-lock-comment-face)
     (t face)))
 
diff --git a/tools/emacs/gyp.el b/tools/emacs/gyp.el
index b98b155c..042ff3a9 100644
--- a/tools/emacs/gyp.el
+++ b/tools/emacs/gyp.el
@@ -213,7 +213,7 @@
                 string-start)
       (setq string-start (gyp-parse-to limit))
       (if string-start
-          (setq group (case (gyp-section-at-point)
+          (setq group (cl-case (gyp-section-at-point)
                         ('dependencies 1)
                         ('variables 2)
                         ('conditions 2)