diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 5283e57669f..4b15bb1f8af 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -244,8 +244,6 @@ structure.")
   (ref nil :type boolean
        :documentation "When t this is used by reference."))
 
-(defvar comp-ctxt) ;; FIXME (to be removed)
-
 ;; Special vars used by some passes
 (defvar comp-func)
 
diff --git a/test/src/comp-test-funcs.el b/test/src/comp-test-funcs.el
index 6127d24e656..5f33eacdb2f 100644
--- a/test/src/comp-test-funcs.el
+++ b/test/src/comp-test-funcs.el
@@ -26,7 +26,7 @@
 (defvar comp-tests-var1 3)
 
 (defun comp-tests-varref-f ()
-    comp-tests-var1)
+  comp-tests-var1)
 
 (defun comp-tests-list-f ()
   (list 1 2 3))