diff --git a/src/Monolog/Handler/TestHandler.php b/src/Monolog/Handler/TestHandler.php
index f639594c..9fe0e03d 100644
--- a/src/Monolog/Handler/TestHandler.php
+++ b/src/Monolog/Handler/TestHandler.php
@@ -86,18 +86,16 @@ class TestHandler extends AbstractProcessingHandler
 
     public function hasRecord($record, $level)
     {
+        if (is_string($record)) {
+            $record = array('message' => $record);
+        }
+
         return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            if (is_array($record)) {
-                if ($rec['message'] !== $record['message']) {
-                    return false;
-                }
-                if ($rec['context'] !== $record['context']) {
-                    return false;
-                }
-            } else {
-                if ($rec['message'] !== $record) {
-                    return false;
-                }
+            if ($rec['message'] !== $record['message']) {
+                return false;
+            }
+            if (isset($record['context']) && $rec['context'] !== $record['context']) {
+                return false;
             }
             return true;
         }, $level);
diff --git a/tests/Monolog/Handler/TestHandlerTest.php b/tests/Monolog/Handler/TestHandlerTest.php
index c86e935a..a7c4fc98 100644
--- a/tests/Monolog/Handler/TestHandlerTest.php
+++ b/tests/Monolog/Handler/TestHandlerTest.php
@@ -56,48 +56,48 @@ class TestHandlerTest extends TestCase
 
     public function testHandlerAssertEmptyContext() {
         $handler = new TestHandler;
-        $record  = $this->getRecord(Logger::WARNING, 'test', []);
-        $this->assertFalse($handler->hasWarning([
+        $record  = $this->getRecord(Logger::WARNING, 'test', array());
+        $this->assertFalse($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [],
-        ]));
+            'context' => array(),
+        )));
 
         $handler->handle($record);
 
-        $this->assertTrue($handler->hasWarning([
+        $this->assertTrue($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [],
-        ]));
-        $this->assertFalse($handler->hasWarning([
+            'context' => array(),
+        )));
+        $this->assertFalse($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [
+            'context' => array(
                 'foo' => 'bar'
-            ],
-        ]));
+            ),
+        )));
     }
 
     public function testHandlerAssertNonEmptyContext() {
         $handler = new TestHandler;
-        $record  = $this->getRecord(Logger::WARNING, 'test', ['foo' => 'bar']);
-        $this->assertFalse($handler->hasWarning([
+        $record  = $this->getRecord(Logger::WARNING, 'test', array('foo' => 'bar'));
+        $this->assertFalse($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [
+            'context' => array(
                 'foo' => 'bar'
-            ],
-        ]));
+            ),
+        )));
 
         $handler->handle($record);
 
-        $this->assertTrue($handler->hasWarning([
+        $this->assertTrue($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [
+            'context' => array(
                 'foo' => 'bar'
-            ],
-        ]));
-        $this->assertFalse($handler->hasWarning([
+            ),
+        )));
+        $this->assertFalse($handler->hasWarning(array(
             'message' => 'test',
-            'context' => [],
-        ]));
+            'context' => array(),
+        )));
     }
 
     public function methodProvider()