diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 5c60fd938..6a7afda24 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -249,13 +249,20 @@ def Reset( self ):
       self._Reset()
 
   def _Reset( self ):
+    self._logger.info( "Debugging complete." )
     if self._uiTab:
+      self._logger.debug( "Clearing down UI with stack_trace: %s",
+                          traceback.format_stack() )
       vim.current.tabpage = self._uiTab
       self._stackTraceView.Reset()
       self._variablesView.Reset()
       self._outputView.Reset()
       self._codeView.Reset()
       vim.command( 'tabclose!' )
+      self._stackTraceView = None
+      self._variablesView = None
+      self._outputView = None
+      self._codeView = None
       self._uiTab = None
 
     # make sure that we're displaying signs in any still-open buffers
diff --git a/tests/lib/autoload/vimspector/test/setup.vim b/tests/lib/autoload/vimspector/test/setup.vim
index c12c433b4..a1df8d536 100644
--- a/tests/lib/autoload/vimspector/test/setup.vim
+++ b/tests/lib/autoload/vimspector/test/setup.vim
@@ -23,7 +23,7 @@ function! vimspector#test#setup#Reset() abort
         \ } )
   call WaitForAssert( {->
         \ assert_true( pyxeval( '_vimspector_session._uiTab is None' ) )
-        \ } )
+        \ }, 10000 )
 
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
   call vimspector#ClearBreakpoints()