diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index efd786a71b3..1d650ac7129 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-10  Tom Tromey  <tom@tromey.com>
+
+	* python/python.c (python_interactive_command): Use gdbpy_enter.
+
 2017-01-10  Tom Tromey  <tom@tromey.com>
 
 	* python/python.c (gdbpy_before_prompt_hook): Use gdbpy_enter,
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 235477c9f61..71c40635220 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -321,7 +321,7 @@ python_interactive_command (char *arg, int from_tty)
 
   arg = skip_spaces (arg);
 
-  ensure_python_env (get_current_arch (), current_language);
+  gdbpy_enter enter_py (get_current_arch (), current_language);
 
   if (arg && *arg)
     {