diff --git a/src/File.php b/src/File.php
index af69806..e04c596 100644
--- a/src/File.php
+++ b/src/File.php
@@ -38,14 +38,14 @@ class File
      */
     public static function removeDirectory($directory)
     {
-        if (substr($directory, -1) != '/')
-        {
-            $directory .= '/';
-        }
-
         // If directory is a directory, read in all the files
         if (is_dir($directory))
         {
+            if (substr($directory, -1) != '/')
+            {
+                $directory .= '/';
+            }
+
             $files = scandir($directory);
 
             // Loop through said files, check for directories, and unlink files
diff --git a/tests/FileTest.php b/tests/FileTest.php
index 182ef78..37c9fad 100644
--- a/tests/FileTest.php
+++ b/tests/FileTest.php
@@ -33,10 +33,10 @@ class FileTest extends PHPUnit_Framework_TestCase
 
     public function testMissingTrailingSlash()
     {
-        $directory = '/tmp/missing';
+        $directory = '/tmp/pickles-fs/missing';
 
         mkdir($directory, 0777, true);
-        touch('/tmp/missing/slash');
+        touch('/tmp/pickles-fs/missing/slash');
 
         Pickles\File::removeDirectory($directory);
 
@@ -45,8 +45,8 @@ class FileTest extends PHPUnit_Framework_TestCase
 
     public function testRemoveFileNotDirectory()
     {
-        $directory = '/tmp/dir';
-        $file      = '/tmp/dir/file';
+        $directory = '/tmp/pickles-fs/dir';
+        $file      = '/tmp/pickles-fs/dir/file';
 
         mkdir($directory, 0777, true);
         touch($file);
@@ -56,6 +56,8 @@ class FileTest extends PHPUnit_Framework_TestCase
         $this->assertFalse(file_exists($file));
 
         Pickles\File::removeDirectory($directory);
+
+        $this->assertFalse(file_exists($directory));
     }
 }