diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php
index 49eaa76f..34e3d7f4 100644
--- a/src/Monolog/Handler/RotatingFileHandler.php
+++ b/src/Monolog/Handler/RotatingFileHandler.php
@@ -11,6 +11,8 @@
 
 namespace Monolog\Handler;
 
+use Monolog\Logger;
+
 /**
  * Stores logs to files that are rotated every day and a limited number of files are kept.
  *
diff --git a/tests/Monolog/Handler/Fixtures/.gitkeep b/tests/Monolog/Handler/Fixtures/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/Monolog/Handler/RotatingFileHandlerTest.php b/tests/Monolog/Handler/RotatingFileHandlerTest.php
new file mode 100644
index 00000000..2873d9a6
--- /dev/null
+++ b/tests/Monolog/Handler/RotatingFileHandlerTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+class RotatingFileHandlerTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $dir = __DIR__.'/Fixtures';
+        chmod($dir, 0777);
+        if (!is_writable($dir)) {
+            $this->markTestSkipped($dir.' must be writeable to test the RotatingFileHandler.');
+        }
+    }
+
+    public function testRotationCreatesNewFile()
+    {
+        touch(__DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
+
+        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
+        $handler->write(array('message' => 'test'));
+
+        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
+        $this->assertTrue(file_exists($log));
+        $this->assertEquals('test', file_get_contents($log));
+    }
+
+    public function testRotationDeletesOldFiles()
+    {
+        touch($old1 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
+        touch($old2 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 2).'.rot');
+        touch($old3 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 3).'.rot');
+        touch($old4 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 4).'.rot');
+
+        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
+        $handler->write(array('message' => 'test'));
+        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
+
+        $handler->close();
+
+        $this->assertTrue(file_exists($log));
+        $this->assertTrue(file_exists($old1));
+        $this->assertFalse(file_exists($old2));
+        $this->assertFalse(file_exists($old3));
+        $this->assertFalse(file_exists($old4));
+        $this->assertEquals('test', file_get_contents($log));
+    }
+
+    public function testRotationNotTriggeredTwiceTheSameDay()
+    {
+        touch($old1 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
+        touch($old2 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 2).'.rot');
+        touch($old3 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 3).'.rot');
+        touch($old4 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 4).'.rot');
+        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
+        file_put_contents($log, 'test');
+
+        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
+        $handler->write(array('message' => 'test'));
+
+        $handler->close();
+
+        $this->assertTrue(file_exists($log));
+        $this->assertTrue(file_exists($old1));
+        $this->assertTrue(file_exists($old2));
+        $this->assertTrue(file_exists($old3));
+        $this->assertTrue(file_exists($old4));
+        $this->assertEquals('testtest', file_get_contents($log));
+    }
+
+    public function testReuseCurrentFile()
+    {
+        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
+        file_put_contents($log, "foo");
+        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
+        $handler->write(array('message' => 'test'));
+        $this->assertEquals('footest', file_get_contents($log));
+    }
+
+    public function tearDown()
+    {
+        foreach (glob(__DIR__.'/Fixtures/*.rot') as $file) {
+            unlink($file);
+        }
+    }
+}