diff --git a/src/test/java/edu/caltech/test/nanodb/storage/TestBufferManager.java b/src/test/java/edu/caltech/test/nanodb/storage/TestBufferManager.java
index 88f168a421554ce10f904f817cd89221fe1b9f7f..470ed25df08bd0504755027eacebff0a494ae9a3 100644
--- a/src/test/java/edu/caltech/test/nanodb/storage/TestBufferManager.java
+++ b/src/test/java/edu/caltech/test/nanodb/storage/TestBufferManager.java
@@ -57,6 +57,9 @@ public class TestBufferManager extends StorageTestCase {
 
         verify(fileMgr, times(1)).loadPage(file, 3, page3.getPageData(), true);
         verify(fileMgr, times(1)).loadPage(file, 5, page.getPageData(), true);
+
+        bufMgr.removeDBFile(file);
+        fileMgr.closeDBFile(file);
     }
 
 
@@ -93,7 +96,7 @@ public class TestBufferManager extends StorageTestCase {
         }
 
         // Give the test 60 seconds to complete.
-        Concurrent.assertConcurrent("Concurrent reads and writes", tasks, 60);
+        Concurrent.assertConcurrent("Concurrent reads and writes", tasks, 120);
     }
 
 
@@ -143,5 +146,9 @@ public class TestBufferManager extends StorageTestCase {
 
             page.unpin();
         }
+
+        // Close the data file.
+        bufMgr.removeDBFile(file);
+        fileMgr.closeDBFile(file);
     }
 }