diff --git a/test/test_xlib_display.py b/test/test_xlib_display.py
index 6199461..23c0514 100644
--- a/test/test_xlib_display.py
+++ b/test/test_xlib_display.py
@@ -52,8 +52,9 @@ class TestXlibDisplay(unittest.TestCase):
         self.assertEqual(str(self.display.display.socket_error), "Display connection closed by client")
 
     def test_can_close_display_and_check_for_error(self):
-        self.display.close()
-        self.assertRaises(Xlib.error.ConnectionClosedError, self.display.flush)
+        with self.assertRaises(Xlib.error.ConnectionClosedError):
+            self.display.close()
+            self.display.flush()
 
     def test_return_fileno(self):
         self.assertTrue(isinstance(self.display.fileno(), int))