diff --git a/test/testdatabase.py b/test/testdatabase.py
index 1b1cfe3..cfe507f 100755
--- a/test/testdatabase.py
+++ b/test/testdatabase.py
@@ -62,9 +62,8 @@ class TestDatabaseAccessors(unittest.TestCase):
 class TestDatabaseIntegrity(unittest.TestCase):
     def create_temp_db(self):
         ddir = tempfile.TemporaryDirectory()
-        fp = open(ddir.name + "/schema", "w")
-        fp.write("fmt:0:newfol schema file:\ntxn:git\n")
-        fp.close()
+        with open(ddir.name + "/schema", "w") as fp:
+            fp.write("fmt:0:newfol schema file:\ntxn:git\n")
         db = Database.load(ddir.name)
         return (ddir, db)
 
@@ -107,9 +106,8 @@ class TestDatabaseIntegrity(unittest.TestCase):
 class TestDatabaseUpgrades(unittest.TestCase):
     def create_temp_db(self):
         ddir = tempfile.TemporaryDirectory()
-        fp = open(ddir.name + "/schema", "w")
-        fp.write("fmt:0:newfol schema file:\ntxn:git\n")
-        fp.close()
+        with open(ddir.name + "/schema", "w") as fp:
+            fp.write("fmt:0:newfol schema file:\ntxn:git\n")
         db = Database.load(ddir.name)
         return (ddir, db)
 
@@ -123,10 +121,9 @@ class TestDatabaseUpgrades(unittest.TestCase):
         db.upgrade(version=version)
         self.assertEqual(Database.read_version(ddir.name),
                          version)
-        fp = open(ddir.name + "/dtb", "rb")
-        data = fp.read(len(pattern))
-        self.assertEqual(data, pattern)
-        fp.close()
+        with open(ddir.name + "/dtb", "rb") as fp:
+            data = fp.read(len(pattern))
+            self.assertEqual(data, pattern)
         ddir.cleanup()
 
     def test_upgrade_to_xz(self):
@@ -145,9 +142,8 @@ class TestDatabaseUpgrades(unittest.TestCase):
 class TestMultipleTransactions(unittest.TestCase):
     def test_multiple_types(self):
         ddir = tempfile.TemporaryDirectory()
-        fp = open(ddir.name + "/schema", "w")
-        fp.write("fmt:0:newfol schema file:\ntxn:git:hash\n")
-        fp.close()
+        with open(ddir.name + "/schema", "w") as fp:
+            fp.write("fmt:0:newfol schema file:\ntxn:git:hash\n")
         db = Database.load(ddir.name)
         db.records()[:] = [Record([1, 2, 3])]
         db.store()
@@ -159,9 +155,8 @@ class TestMultipleTransactions(unittest.TestCase):
 class TestDatabaseFiltering(unittest.TestCase):
     def create_temp_db(self):
         ddir = tempfile.TemporaryDirectory()
-        fp = open(ddir.name + "/schema", "w")
-        fp.write("fmt:0:newfol schema file:\ntxn:git\n")
-        fp.close()
+        with open(ddir.name + "/schema", "w") as fp:
+            fp.write("fmt:0:newfol schema file:\ntxn:git\n")
         db = Database.load(ddir.name)
         return (ddir, db)