diff --git a/kitty_tests/__init__.py b/kitty_tests/__init__.py
index 1d7c70231..4096b7ddf 100644
--- a/kitty_tests/__init__.py
+++ b/kitty_tests/__init__.py
@@ -157,6 +157,9 @@ class BaseTest(TestCase):
     maxDiff = 2048
     is_ci = os.environ.get('CI') == 'true'
 
+    def tearDown(self):
+        set_options(None)
+
     def set_options(self, options=None):
         final_options = {'scrollback_pager_history_size': 1024, 'click_interval': 0.5}
         if options:
diff --git a/kitty_tests/file_transmission.py b/kitty_tests/file_transmission.py
index f7f5df5af..4ddeb6c47 100644
--- a/kitty_tests/file_transmission.py
+++ b/kitty_tests/file_transmission.py
@@ -62,6 +62,7 @@ def serialized_cmd(**fields) -> str:
 class TestFileTransmission(BaseTest):
 
     def setUp(self):
+        super().setUp()
         self.tdir = os.path.realpath(tempfile.mkdtemp())
         self.responses = []
         self.orig_home = os.environ.get('HOME')
@@ -73,6 +74,7 @@ class TestFileTransmission(BaseTest):
             os.environ.pop('HOME', None)
         else:
             os.environ['HOME'] = self.orig_home
+        super().tearDown()
 
     def clean_tdir(self):
         shutil.rmtree(self.tdir)
diff --git a/kitty_tests/fonts.py b/kitty_tests/fonts.py
index 089ce7df4..65f40d373 100644
--- a/kitty_tests/fonts.py
+++ b/kitty_tests/fonts.py
@@ -24,6 +24,7 @@ from . import BaseTest
 class Rendering(BaseTest):
 
     def setUp(self):
+        super().setUp()
         self.test_ctx = setup_for_testing()
         self.test_ctx.__enter__()
         self.sprites, self.cell_width, self.cell_height = self.test_ctx.__enter__()
@@ -39,6 +40,7 @@ class Rendering(BaseTest):
         self.test_ctx.__exit__()
         del self.sprites, self.cell_width, self.cell_height, self.test_ctx
         shutil.rmtree(self.tdir)
+        super().tearDown()
 
     def test_sprite_map(self):
         sprite_map_set_limits(10, 2)
diff --git a/kitty_tests/options.py b/kitty_tests/options.py
index e93593b7e..df28d89c9 100644
--- a/kitty_tests/options.py
+++ b/kitty_tests/options.py
@@ -11,11 +11,13 @@ from kitty.fast_data_types import Color
 class TestConfParsing(BaseTest):
 
     def setUp(self):
+        super().setUp()
         self.error_messages = []
         log_error.redirect = self.error_messages.append
 
     def tearDown(self):
         del log_error.redirect
+        super().tearDown()
 
     def test_conf_parsing(self):
         from kitty.config import load_config, defaults