diff --git a/tests/meson.build b/tests/meson.build
index 851a9c17c..4a6025b9b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -27,6 +27,7 @@ unit_tests = [
     'markup',
     'params',
     'signalTracker',
+    'url',
 ]
 
 foreach test : unit_tests
@@ -45,7 +46,6 @@ foreach test : unit_tests
 endforeach
 
 legacy_tests = [
-    'url',
     'versionCompare',
 ]
 
diff --git a/tests/unit/url.js b/tests/unit/url.js
index 00ad66dcb..6b3d93c82 100644
--- a/tests/unit/url.js
+++ b/tests/unit/url.js
@@ -2,121 +2,120 @@
 
 // Test cases for MessageTray URLification
 
-const JsUnit = imports.jsUnit;
-
 import 'resource:///org/gnome/shell/ui/environment.js';
+import {findUrls} from 'resource:///org/gnome/shell/misc/util.js';
 
-import * as Util from 'resource:///org/gnome/shell/misc/util.js';
+describe('findUrls()', () => {
+    const urlParameters = [
+        {
+            input: 'This is a test',
+            output: [],
+        },
+        {
+            input: 'This is http://www.gnome.org a test',
+            output: [{url: 'http://www.gnome.org', pos: 8}],
+        },
+        {
+            input: 'This is http://www.gnome.org',
+            output: [{url: 'http://www.gnome.org', pos: 8}],
+        },
+        {
+            input: 'http://www.gnome.org a test',
+            output: [{url: 'http://www.gnome.org', pos: 0}],
+        },
+        {
+            input: 'http://www.gnome.org',
+            output: [{url: 'http://www.gnome.org', pos: 0}],
+        },
+        {
+            input: 'Go to http://www.gnome.org.',
+            output: [{url: 'http://www.gnome.org', pos: 6}],
+        },
+        {
+            input: 'Go to http://www.gnome.org/.',
+            output: [{url: 'http://www.gnome.org/', pos: 6}],
+        },
+        {
+            input: '(Go to http://www.gnome.org!)',
+            output: [{url: 'http://www.gnome.org', pos: 7}],
+        },
+        {
+            input: 'Use GNOME (http://www.gnome.org).',
+            output: [{url: 'http://www.gnome.org', pos: 11}],
+        },
+        {
+            input: 'This is a http://www.gnome.org/path test.',
+            output: [{url: 'http://www.gnome.org/path', pos: 10}],
+        },
+        {
+            input: 'This is a www.gnome.org scheme-less test.',
+            output: [{url: 'www.gnome.org', pos: 10}],
+        },
+        {
+            input: 'This is a www.gnome.org/scheme-less test.',
+            output: [{url: 'www.gnome.org/scheme-less', pos: 10}],
+        },
+        {
+            input: 'This is a http://www.gnome.org:99/port test.',
+            output: [{url: 'http://www.gnome.org:99/port', pos: 10}],
+        },
+        {
+            input: 'This is an ftp://www.gnome.org/ test.',
+            output: [{url: 'ftp://www.gnome.org/', pos: 11}],
+        },
+        {
+            input: 'https://www.gnome.org/(some_url,_with_very_unusual_characters)',
+            output: [{url: 'https://www.gnome.org/(some_url,_with_very_unusual_characters)', pos: 0}],
+        },
+        {
+            input: 'https://www.gnome.org/(some_url_with_unbalanced_parenthesis',
+            output: [{url: 'https://www.gnome.org/', pos: 0}],
+        },
+        {
+            input: 'https://www.gnome.org/‎ plus trailing junk',
+            output: [{url: 'https://www.gnome.org/', pos: 0}],
+        },
 
-const tests = [
-    {
-        input: 'This is a test',
-        output: [],
-    },
-    {
-        input: 'This is http://www.gnome.org a test',
-        output: [{url: 'http://www.gnome.org', pos: 8}],
-    },
-    {
-        input: 'This is http://www.gnome.org',
-        output: [{url: 'http://www.gnome.org', pos: 8}],
-    },
-    {
-        input: 'http://www.gnome.org a test',
-        output: [{url: 'http://www.gnome.org', pos: 0}],
-    },
-    {
-        input: 'http://www.gnome.org',
-        output: [{url: 'http://www.gnome.org', pos: 0}],
-    },
-    {
-        input: 'Go to http://www.gnome.org.',
-        output: [{url: 'http://www.gnome.org', pos: 6}],
-    },
-    {
-        input: 'Go to http://www.gnome.org/.',
-        output: [{url: 'http://www.gnome.org/', pos: 6}],
-    },
-    {
-        input: '(Go to http://www.gnome.org!)',
-        output: [{url: 'http://www.gnome.org', pos: 7}],
-    },
-    {
-        input: 'Use GNOME (http://www.gnome.org).',
-        output: [{url: 'http://www.gnome.org', pos: 11}],
-    },
-    {
-        input: 'This is a http://www.gnome.org/path test.',
-        output: [{url: 'http://www.gnome.org/path', pos: 10}],
-    },
-    {
-        input: 'This is a www.gnome.org scheme-less test.',
-        output: [{url: 'www.gnome.org', pos: 10}],
-    },
-    {
-        input: 'This is a www.gnome.org/scheme-less test.',
-        output: [{url: 'www.gnome.org/scheme-less', pos: 10}],
-    },
-    {
-        input: 'This is a http://www.gnome.org:99/port test.',
-        output: [{url: 'http://www.gnome.org:99/port', pos: 10}],
-    },
-    {
-        input: 'This is an ftp://www.gnome.org/ test.',
-        output: [{url: 'ftp://www.gnome.org/', pos: 11}],
-    },
-    {
-        input: 'https://www.gnome.org/(some_url,_with_very_unusual_characters)',
-        output: [{url: 'https://www.gnome.org/(some_url,_with_very_unusual_characters)', pos: 0}],
-    },
-    {
-        input: 'https://www.gnome.org/(some_url_with_unbalanced_parenthesis',
-        output: [{url: 'https://www.gnome.org/', pos: 0}],
-    },
-    {
-        input: 'https://www.gnome.org/‎ plus trailing junk',
-        output: [{url: 'https://www.gnome.org/', pos: 0}],
-    },
+        {
+            input: 'Visit http://www.gnome.org/ and http://developer.gnome.org',
+            output: [{url: 'http://www.gnome.org/', pos: 6},
+                {url: 'http://developer.gnome.org', pos: 32}],
+        },
 
-    {
-        input: 'Visit http://www.gnome.org/ and http://developer.gnome.org',
-        output: [{url: 'http://www.gnome.org/', pos: 6},
-            {url: 'http://developer.gnome.org', pos: 32}],
-    },
+        {
+            input: 'This is not.a.domain test.',
+            output: [],
+        },
+        {
+            input: 'This is not:a.url test.',
+            output: [],
+        },
+        {
+            input: 'This is not:/a.url/ test.',
+            output: [],
+        },
+        {
+            input: 'This is not:/a.url/ test.',
+            output: [],
+        },
+        {
+            input: 'This is not@a.url/ test.',
+            output: [],
+        },
+        {
+            input: 'This is surely@not.a/url test.',
+            output: [],
+        },
+    ];
 
-    {
-        input: 'This is not.a.domain test.',
-        output: [],
-    },
-    {
-        input: 'This is not:a.url test.',
-        output: [],
-    },
-    {
-        input: 'This is not:/a.url/ test.',
-        output: [],
-    },
-    {
-        input: 'This is not:/a.url/ test.',
-        output: [],
-    },
-    {
-        input: 'This is not@a.url/ test.',
-        output: [],
-    },
-    {
-        input: 'This is surely@not.a/url test.',
-        output: [],
-    },
-];
+    for (const param of urlParameters) {
+        const {input, output} = param;
+        const findsOrDoesNotFind = output.length > 0
+            ? 'finds'
+            : 'does not find';
 
-for (let i = 0; i < tests.length; i++) {
-    let match = Util.findUrls(tests[i].input);
-
-    JsUnit.assertEquals(`Test ${i} match length`,
-        match.length, tests[i].output.length);
-    for (let j = 0; j < match.length; j++) {
-        JsUnit.assertEquals(`Test ${i}, match ${j} url`, match[j].url, tests[i].output[j].url);
-        JsUnit.assertEquals(`Test ${i}, match ${j} position`, match[j].pos, tests[i].output[j].pos);
+        it(`${findsOrDoesNotFind} URLs in "${input}"`, () => {
+            expect(findUrls(input)).toEqual(output);
+        });
     }
-}
+});