diff --git a/test/test_freeze.py b/test/test_freeze.py
index fc164ae..184a18e 100644
--- a/test/test_freeze.py
+++ b/test/test_freeze.py
@@ -29,9 +29,9 @@ class FreezeTestCase(unittest.TestCase):
         from dataset.freeze.app import freeze
 
         freeze(self.db['weather'].all(), format='csv', filename='wäther.csv'.encode('utf8'), prefix=self.d)
-        self.assert_(os.path.exists(os.path.join(self.d, 'wäther.csv')))
+        self.assertTrue(os.path.exists(os.path.join(self.d, 'wäther.csv')))
         freeze(self.db['weather'].all(), format='csv', filename='wäther.csv', prefix=self.d)
-        self.assert_(os.path.exists(os.path.join(self.d, 'wäther.csv')))
+        self.assertTrue(os.path.exists(os.path.join(self.d, 'wäther.csv')))
 
     def test_freeze_csv(self):
         from dataset.freeze.app import freeze
@@ -43,23 +43,26 @@ class FreezeTestCase(unittest.TestCase):
             fh = open(path, 'rt', encoding='utf8', newline='')
         else:
             fh = open(path, 'rU')
-        rows = list(reader(fh))
-        keys = rows[0]
-        if not PY3:
-            keys = [k.decode('utf8') for k in keys]
-        for i, d1 in enumerate(TEST_DATA):
-            d2 = dict(zip(keys, rows[i + 1]))
-            for k in d1.keys():
-                v2 = d2[k]
-                if not PY3:
-                    v2 = v2.decode('utf8')
-                v1 = value_to_str(d1[k])
-                if not isinstance(v1, text_type):
-                    if isinstance(v1, binary_type):
-                        v1 = text_type(v1, encoding='utf8')
-                    else:
-                        v1 = '%s' % v1
-                self.assertEqual(v2, v1)
+        try:
+            rows = list(reader(fh))
+            keys = rows[0]
+            if not PY3:
+                keys = [k.decode('utf8') for k in keys]
+            for i, d1 in enumerate(TEST_DATA):
+                d2 = dict(zip(keys, rows[i + 1]))
+                for k in d1.keys():
+                    v2 = d2[k]
+                    if not PY3:
+                        v2 = v2.decode('utf8')
+                    v1 = value_to_str(d1[k])
+                    if not isinstance(v1, text_type):
+                        if isinstance(v1, binary_type):
+                            v1 = text_type(v1, encoding='utf8')
+                        else:
+                            v1 = '%s' % v1
+                    self.assertEqual(v2, v1)
+        finally:
+            fh.close()
 
 
 class SerializerTestCase(unittest.TestCase):
@@ -74,4 +77,4 @@ class SerializerTestCase(unittest.TestCase):
         s = Serializer(Export({'filename': 'f'}, {}), '')
         s.wrap
         s = Serializer(Export({'filename': '-'}, {}), '')
-        self.assert_(s.fileobj)
+        self.assertTrue(s.fileobj)
diff --git a/test/test_freeze_config.py b/test/test_freeze_config.py
index 096a10e..f892c03 100644
--- a/test/test_freeze_config.py
+++ b/test/test_freeze_config.py
@@ -23,7 +23,7 @@ class TestConfiguration(unittest.TestCase):
         self.assertTrue(exports[0].get_bool('bool'))
         self.assertEqual(exports[0].get_int('nan', 'default'), 'default')
         self.assertEqual(exports[0].get_int('number'), 5)
-        self.assert_(exports[0].name)
+        self.assertTrue(exports[0].name)
 
     def test_exports_fail(self):
         from dataset.freeze.config import Configuration