diff --git a/tests/Storm/FileSystem/DiskTest.php b/tests/Storm/FileSystem/DiskTest.php
index b00e8096d16e4bf4775b2870d785b0b334202a57..0c6db991cd402495aa21260d848c3e3d4a656c56 100644
--- a/tests/Storm/FileSystem/DiskTest.php
+++ b/tests/Storm/FileSystem/DiskTest.php
@@ -42,8 +42,10 @@ class Storm_FileSystem_DiskBasicTest extends Storm_FileSystem_DiskTestCase {
   }
 
   public function tearDown() {
-    chmod($this->_directory.'/testfile',0700);
-    unlink($this->_directory.'/testfile');
+    if (file_exists($this->_directory.'/testfile')){
+      chmod($this->_directory.'/testfile',0700);
+      unlink($this->_directory.'/testfile');
+    }
     chmod($this->_directory.'/'.$this->_subdirectory,0700);
     rmdir($this->_directory.'/'.$this->_subdirectory);
     rmdir($this->_directory);
@@ -121,7 +123,6 @@ class Storm_FileSystem_DiskBasicTest extends Storm_FileSystem_DiskTestCase {
     $this->_fs->filePutContents($this->_directory . '/testfile2',
                                 'buy some butter');
     $this->_fs->deleteFilesAt($this->_directory);
-    $this->assertEquals([],
-                        $this->_fs->fileNamesAt($this->_directory));
+    $this->assertEmpty($this->_fs->fileNamesAt($this->_directory));
   }
 }