diff --git a/tests/dbshell/test_postgresql_psycopg2.py b/tests/dbshell/test_postgresql_psycopg2.py
index aecbba7f42..c270de3041 100644
--- a/tests/dbshell/test_postgresql_psycopg2.py
+++ b/tests/dbshell/test_postgresql_psycopg2.py
@@ -23,7 +23,8 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
         def _mock_subprocess_call(*args):
             self.subprocess_args = list(*args)
             if 'PGPASSFILE' in os.environ:
-                self.pgpass = open(os.environ['PGPASSFILE'], 'rb').read()
+                with open(os.environ['PGPASSFILE'], 'rb') as f:
+                    self.pgpass = f.read()
             else:
                 self.pgpass = None
             return 0