diff --git a/src/Monolog/Handler/AmqpHandler.php b/src/Monolog/Handler/AmqpHandler.php
index 8f0a2bab..4711922f 100644
--- a/src/Monolog/Handler/AmqpHandler.php
+++ b/src/Monolog/Handler/AmqpHandler.php
@@ -114,12 +114,7 @@ class AmqpHandler extends AbstractProcessingHandler
      */
     private function getRoutingKey(array $record)
     {
-        $routingKey = sprintf(
-            '%s.%s',
-            // TODO 2.0 remove substr call
-            substr($record['level_name'], 0, 4),
-            $record['channel']
-        );
+        $routingKey = sprintf('%s.%s', $record['level_name'], $record['channel']);
 
         return strtolower($routingKey);
     }
diff --git a/tests/Monolog/Handler/AmqpHandlerTest.php b/tests/Monolog/Handler/AmqpHandlerTest.php
index 8e0e7237..26c0170b 100644
--- a/tests/Monolog/Handler/AmqpHandlerTest.php
+++ b/tests/Monolog/Handler/AmqpHandlerTest.php
@@ -61,7 +61,7 @@ class AmqpHandlerTest extends TestCase
                 'channel' => 'test',
                 'extra' => array(),
             ),
-            'warn.test',
+            'warning.test',
             0,
             array(
                 'delivery_mode' => 2,
@@ -111,7 +111,7 @@ class AmqpHandlerTest extends TestCase
                 'extra' => array(),
             ),
             'log',
-            'warn.test',
+            'warning.test',
             false,
             false,
             null,