diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index d22d19ce1ec..b87cbf7e83c 100644
--- a/lisp/emacs-lisp/comp-cstr.el
+++ b/lisp/emacs-lisp/comp-cstr.el
@@ -175,6 +175,10 @@ Return them as multiple value."
      collect cstr into positives
    finally return (cl-values positives negatives)))
 
+;; So we can load comp-cstr.el and comp.el in non native compiled
+;; builds.
+(defvar comp-ctxt)
+
 (defvar comp-cstr-one (comp-value-to-cstr 1)
   "Represent the integer immediate one.")
 
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index c2c9987d9e3..1fb07c66adf 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -552,8 +552,6 @@ Useful to hook into pass checkers.")
     (signal (function (symbol t) nil)))
   "Alist used for type propagation.")
 
-(defvar comp-ctxt) ; To make comp.el loadable in non native comp builds.
-
 (defconst comp-known-func-cstr-h
   (cl-loop
    with comp-ctxt = (make-comp-cstr-ctxt)
diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el b/test/lisp/emacs-lisp/comp-cstr-tests.el
index d45a3e5fafd..2e4628522f4 100644
--- a/test/lisp/emacs-lisp/comp-cstr-tests.el
+++ b/test/lisp/emacs-lisp/comp-cstr-tests.el
@@ -29,8 +29,6 @@
 (require 'cl-lib)
 (require 'comp-cstr)
 
-(defvar comp-ctxt) ; So we can run these tests on non native compiled builds.
-
 (cl-eval-when (compile eval load)
 
   (defun comp-cstr-test-ts (type-spec)