bpython
diff --git a/‎bpython/test/test_curtsies_painting.py‎
Lines changed: 20 additions & 5 deletions b/‎bpython/test/test_curtsies_painting.py‎
Lines changed: 20 additions & 5 deletions
diff --git a/‎bpython/test/test_curtsies_repl.py‎
Lines changed: 1 addition & 0 deletions b/‎bpython/test/test_curtsies_repl.py‎
Lines changed: 1 addition & 0 deletions
@@ -6,8 +6,9 @@
 
 from curtsies.formatstringarray import FormatStringTest, fsarray
 from curtsies.fmtfuncs import cyan, bold, green, yellow, on_magenta, red
-from bpython.curtsiesfrontend.events import RefreshRequestEvent
 
+from bpython.curtsiesfrontend.events import RefreshRequestEvent
+from bpython.test import mock
 from bpython import config, inspection
 from bpython.curtsiesfrontend.repl import Repl
 from bpython.curtsiesfrontend import replpainter
@@ -23,7 +24,21 @@ def setup_config():
     return config_struct
 
 
-class TestCurtsiesPainting(FormatStringTest, TestCase):
+class ClearEnviron(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.mock_environ = mock.patch.dict('os.environ', {}, clear=True)
+        cls.mock_environ.start()
+        TestCase.setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.mock_environ.stop()
+        TestCase.tearDownClass()
+
+
+class CurtsiesPaintingTest(FormatStringTest, ClearEnviron):
     def setUp(self):
         self.repl = Repl(config=setup_config())
         # clear history
@@ -42,13 +57,13 @@ def assert_paint_ignoring_formatting(self, screen, cursor_row_col=None):
             self.assertEqual(cursor_pos, cursor_row_col)
 
 
-class TestCurtsiesPaintingTest(TestCurtsiesPainting):
+class TestCurtsiesPaintingTest(CurtsiesPaintingTest):
 
     def test_history_is_cleared(self):
         self.assertEqual(self.repl.rl_history.entries, [''])
 
 
-class TestCurtsiesPaintingSimple(TestCurtsiesPainting):
+class TestCurtsiesPaintingSimple(CurtsiesPaintingTest):
 
     def test_startup(self):
         screen = fsarray([cyan('>>> '), cyan('Welcome to')])
@@ -137,7 +152,7 @@ def output_to_repl(repl):
         sys.stdout, sys.stderr = old_out, old_err
 
 
-class TestCurtsiesRewindRedraw(TestCurtsiesPainting):
+class TestCurtsiesRewindRedraw(CurtsiesPaintingTest):
     def refresh(self):
         self.refresh_requests.append(RefreshRequestEvent())
 
 
@@ -221,6 +221,7 @@ def create_repl(**kwargs):
     config = setup_config({'editor': 'true'})
     repl = curtsiesrepl.Repl(config=config, **kwargs)
     os.environ['PAGER'] = 'true'
+    os.environ.pop('PYTHONSTARTUP', None)
     repl.width = 50
     repl.height = 20
     return repl