diff --git a/src/Transport/Factory.php b/src/Transport/Factory.php
index ff974fb3..fa7d4e8d 100644
--- a/src/Transport/Factory.php
+++ b/src/Transport/Factory.php
@@ -21,7 +21,6 @@ abstract class Factory
         'file'      => 'Zend\Mail\Transport\File',
         'inmemory'  => 'Zend\Mail\Transport\InMemory',
         'memory'    => 'Zend\Mail\Transport\InMemory',
-        'null'      => 'Zend\Mail\Transport\InMemory',
         'sendmail'  => 'Zend\Mail\Transport\Sendmail',
         'smtp'      => 'Zend\Mail\Transport\Smtp',
     ];
diff --git a/src/Transport/Null.php b/src/Transport/Null.php
deleted file mode 100644
index 266463de..00000000
--- a/src/Transport/Null.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Mail\Transport;
-
-/**
- * Stub class for backwards compatibility.
- *
- * Since PHP 7 adds "null" as a reserved keyword, we can no longer have a class
- * named that and retain PHP 7 compatibility. The original class has been
- * renamed to "InMemory", and this class is now an extension of it. It raises an
- * E_USER_DEPRECATED to warn users to migrate.
- *
- * @deprecated
- */
-class Null extends InMemory
-{
-    public function __construct()
-    {
-        trigger_error(
-            sprintf(
-                'The class %s has been deprecated; please use %s\\InMemory',
-                __CLASS__,
-                __NAMESPACE__
-            ),
-            E_USER_DEPRECATED
-        );
-    }
-}
diff --git a/test/Transport/FactoryTest.php b/test/Transport/FactoryTest.php
index a605e163..0b1f97be 100644
--- a/test/Transport/FactoryTest.php
+++ b/test/Transport/FactoryTest.php
@@ -71,10 +71,6 @@ public function typeProvider()
             ['Zend\Mail\Transport\Smtp'],
         ];
 
-        if (version_compare(PHP_VERSION, '7.0', '<')) {
-            $types[] = ['Zend\Mail\Transport\Null'];
-        }
-
         return $types;
     }
 
@@ -96,15 +92,12 @@ public function typeAliasProvider()
     {
         return [
             ['file', 'Zend\Mail\Transport\File'],
-            ['null', 'Zend\Mail\Transport\InMemory'],
             ['memory', 'Zend\Mail\Transport\InMemory'],
             ['inmemory', 'Zend\Mail\Transport\InMemory'],
             ['InMemory', 'Zend\Mail\Transport\InMemory'],
             ['sendmail', 'Zend\Mail\Transport\Sendmail'],
             ['smtp', 'Zend\Mail\Transport\Smtp'],
             ['File', 'Zend\Mail\Transport\File'],
-            ['Null', 'Zend\Mail\Transport\InMemory'],
-            ['NULL', 'Zend\Mail\Transport\InMemory'],
             ['Sendmail', 'Zend\Mail\Transport\Sendmail'],
             ['SendMail', 'Zend\Mail\Transport\Sendmail'],
             ['Smtp', 'Zend\Mail\Transport\Smtp'],
@@ -118,7 +111,7 @@ public function typeAliasProvider()
     public function testCanUseTraversableAsSpec()
     {
         $spec = new ArrayObject([
-            'type' => 'null'
+            'type' => 'inMemory'
         ]);
 
         $transport = Factory::create($spec);
diff --git a/test/Transport/NullTest.php b/test/Transport/NullTest.php
deleted file mode 100644
index f563a448..00000000
--- a/test/Transport/NullTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace ZendTest\Mail\Transport;
-
-use PHPUnit\Framework\TestCase;
-use Zend\Mail\Transport\Null as NullTransport;
-
-/**
- * @group      Zend_Mail
- */
-class NullTest extends TestCase
-{
-    public function setUp()
-    {
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $this->markTestSkipped('Cannot test Null transport under PHP 7; reserved keyword');
-        }
-    }
-
-    public function testRaisesNoticeOnInstantiation()
-    {
-        $this->expectException('PHPUnit_Framework_Error_Deprecated');
-        new NullTransport();
-    }
-}