diff --git a/src/Transport/Factory.php b/src/Transport/Factory.php
index 88301aa4..e5b1e6e4 100644
--- a/src/Transport/Factory.php
+++ b/src/Transport/Factory.php
@@ -20,7 +20,6 @@ abstract class Factory
         'file'      => File::class,
         'inmemory'  => InMemory::class,
         'memory'    => InMemory::class,
-        'null'      => InMemory::class,
         'sendmail'  => Sendmail::class,
         'smtp'      => Smtp::class,
     ];
diff --git a/src/Transport/Null.php b/src/Transport/Null.php
deleted file mode 100644
index 4f4ff3c5..00000000
--- a/src/Transport/Null.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-mail for the canonical source repository
- * @copyright https://github.com/laminas/laminas-mail/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-mail/blob/master/LICENSE.md New BSD License
- */
-
-namespace Laminas\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 94e0aa8e..3f529fff 100644
--- a/test/Transport/FactoryTest.php
+++ b/test/Transport/FactoryTest.php
@@ -77,10 +77,6 @@ public function typeProvider()
             [Smtp::class],
         ];
 
-        if (version_compare(PHP_VERSION, '7.0', '<')) {
-            $types[] = [NullTransport::class];
-        }
-
         return $types;
     }
 
@@ -102,15 +98,12 @@ public function typeAliasProvider()
     {
         return [
             ['file', File::class],
-            ['null', InMemory::class],
             ['memory', InMemory::class],
             ['inmemory', InMemory::class],
             ['InMemory', InMemory::class],
             ['sendmail', Sendmail::class],
             ['smtp', Smtp::class],
             ['File', File::class],
-            ['Null', InMemory::class],
-            ['NULL', InMemory::class],
             ['Sendmail', Sendmail::class],
             ['SendMail', Sendmail::class],
             ['Smtp', Smtp::class],
@@ -124,7 +117,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 bbf7fc1e..00000000
--- a/test/Transport/NullTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-mail for the canonical source repository
- * @copyright https://github.com/laminas/laminas-mail/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-mail/blob/master/LICENSE.md New BSD License
- */
-
-namespace LaminasTest\Mail\Transport;
-
-use Laminas\Mail\Transport\Null as NullTransport;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @group      Laminas_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();
-    }
-}