diff --git a/tests/unit/Install/BaseUrlTest.php b/tests/unit/Install/BaseUrlTest.php
index 78558cddd..90f24a90f 100644
--- a/tests/unit/Install/BaseUrlTest.php
+++ b/tests/unit/Install/BaseUrlTest.php
@@ -47,37 +47,61 @@ class BaseUrlTest extends TestCase
     public function urlProvider()
     {
         return [
-            ['',                                    ''],
-            ['flarum.org',                          'http://flarum.org'],
-            ['flarum.org/',                         'http://flarum.org'],
-            ['http://flarum.org',                   'http://flarum.org'],
-            ['http://flarum.org/',                  'http://flarum.org'],
-            ['https://flarum.org',                  'https://flarum.org'],
-            ['http://flarum.org/index.php',         'http://flarum.org'],
-            ['http://flarum.org/index.php/',        'http://flarum.org'],
-            ['http://flarum.org/flarum',            'http://flarum.org/flarum'],
-            ['http://flarum.org/flarum/index.php',  'http://flarum.org/flarum'],
-            ['http://flarum.org/flarum/index.php/', 'http://flarum.org/flarum'],
-            ['sub.flarum.org',                      'http://sub.flarum.org'],
-            ['http://sub.flarum.org',               'http://sub.flarum.org'],
+            ['',                                         ''],
+            ['flarum.org',                               'http://flarum.org'],
+            ['flarum.org/',                              'http://flarum.org'],
+            ['http://flarum.org',                        'http://flarum.org'],
+            ['http://flarum.org/',                       'http://flarum.org'],
+            ['https://flarum.org',                       'https://flarum.org'],
+            ['http://flarum.org/index.php',              'http://flarum.org'],
+            ['http://flarum.org/index.php/',             'http://flarum.org'],
+            ['http://flarum.org/flarum',                 'http://flarum.org/flarum'],
+            ['http://flarum.org/flarum/index.php',       'http://flarum.org/flarum'],
+            ['http://flarum.org/flarum/index.php/',      'http://flarum.org/flarum'],
+            ['sub.flarum.org',                           'http://sub.flarum.org'],
+            ['http://sub.flarum.org',                    'http://sub.flarum.org'],
+            ['flarum.org:8000',                          'http://flarum.org:8000'],
+            ['flarum.org:8000/',                         'http://flarum.org:8000'],
+            ['http://flarum.org:8000',                   'http://flarum.org:8000'],
+            ['http://flarum.org:8000/',                  'http://flarum.org:8000'],
+            ['https://flarum.org:8000',                  'https://flarum.org:8000'],
+            ['http://flarum.org:8000/index.php',         'http://flarum.org:8000'],
+            ['http://flarum.org:8000/index.php/',        'http://flarum.org:8000'],
+            ['http://flarum.org:8000/flarum',            'http://flarum.org:8000/flarum'],
+            ['http://flarum.org:8000/flarum/index.php',  'http://flarum.org:8000/flarum'],
+            ['http://flarum.org:8000/flarum/index.php/', 'http://flarum.org:8000/flarum'],
+            ['sub.flarum.org:8000',                      'http://sub.flarum.org:8000'],
+            ['http://sub.flarum.org:8000',               'http://sub.flarum.org:8000'],
         ];
     }
 
     public function emailProvider()
     {
         return [
-            ['flarum.org',                          'noreply@flarum.org'],
-            ['flarum.org/',                         'noreply@flarum.org'],
-            ['http://flarum.org',                   'noreply@flarum.org'],
-            ['http://flarum.org/',                  'noreply@flarum.org'],
-            ['https://flarum.org',                  'noreply@flarum.org'],
-            ['http://flarum.org/index.php',         'noreply@flarum.org'],
-            ['http://flarum.org/index.php/',        'noreply@flarum.org'],
-            ['http://flarum.org/flarum',            'noreply@flarum.org'],
-            ['http://flarum.org/flarum/index.php',  'noreply@flarum.org'],
-            ['http://flarum.org/flarum/index.php/', 'noreply@flarum.org'],
-            ['sub.flarum.org',                      'noreply@sub.flarum.org'],
-            ['http://sub.flarum.org',               'noreply@sub.flarum.org'],
+            ['flarum.org',                               'noreply@flarum.org'],
+            ['flarum.org/',                              'noreply@flarum.org'],
+            ['http://flarum.org',                        'noreply@flarum.org'],
+            ['http://flarum.org/',                       'noreply@flarum.org'],
+            ['https://flarum.org',                       'noreply@flarum.org'],
+            ['http://flarum.org/index.php',              'noreply@flarum.org'],
+            ['http://flarum.org/index.php/',             'noreply@flarum.org'],
+            ['http://flarum.org/flarum',                 'noreply@flarum.org'],
+            ['http://flarum.org/flarum/index.php',       'noreply@flarum.org'],
+            ['http://flarum.org/flarum/index.php/',      'noreply@flarum.org'],
+            ['sub.flarum.org',                           'noreply@sub.flarum.org'],
+            ['http://sub.flarum.org',                    'noreply@sub.flarum.org'],
+            ['flarum.org:8000',                          'noreply@flarum.org'],
+            ['flarum.org:8000/',                         'noreply@flarum.org'],
+            ['http://flarum.org:8000',                   'noreply@flarum.org'],
+            ['http://flarum.org:8000/',                  'noreply@flarum.org'],
+            ['https://flarum.org:8000',                  'noreply@flarum.org'],
+            ['http://flarum.org:8000/index.php',         'noreply@flarum.org'],
+            ['http://flarum.org:8000/index.php/',        'noreply@flarum.org'],
+            ['http://flarum.org:8000/flarum',            'noreply@flarum.org'],
+            ['http://flarum.org:8000/flarum/index.php',  'noreply@flarum.org'],
+            ['http://flarum.org:8000/flarum/index.php/', 'noreply@flarum.org'],
+            ['sub.flarum.org:8000',                      'noreply@sub.flarum.org'],
+            ['http://sub.flarum.org:8000',               'noreply@sub.flarum.org'],
         ];
     }
 }