diff --git a/Python/ceval.c b/Python/ceval.c
index 9a64b48e2a53b4..7502b6fca823ab 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -797,7 +797,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     _Py_EnsureTstateNotNULL(tstate);
     CALL_STAT_INC(pyeval_calls);
 
-#if USE_COMPUTED_GOTOS
+#if USE_COMPUTED_GOTOS && !defined(Py_TAIL_CALL_INTERP)
 /* Import the static jump table */
 #include "opcode_targets.h"
 #endif
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
index 075200554cc4ed..641c239602fea5 100644
--- a/Python/ceval_macros.h
+++ b/Python/ceval_macros.h
@@ -47,7 +47,7 @@
 #define OR_DTRACE_LINE
 #endif
 
-#if defined(HAVE_COMPUTED_GOTOS) && !defined(Py_TAIL_CALL_INTERP)
+#ifdef HAVE_COMPUTED_GOTO
     #ifndef USE_COMPUTED_GOTOS
     #define USE_COMPUTED_GOTOS 1
     #endif