diff --git a/ghost/mw-vhost/test/vhost.test.js b/ghost/mw-vhost/test/vhost.test.js
index d4ac8002cd..58ec4f2d45 100644
--- a/ghost/mw-vhost/test/vhost.test.js
+++ b/ghost/mw-vhost/test/vhost.test.js
@@ -102,7 +102,16 @@ describe('vhost(hostname, server)', function () {
         vhosts.push(vhost('tobi.com', tobi));
         vhosts.push(vhost('loki.com', loki));
 
-        const app = createServer(vhosts);
+        const server = createServer(vhosts);
+        const listeners = server.listeners('request');
+
+        server.removeAllListeners('request');
+        listeners.unshift(function (req) {
+            req.headers.host = undefined;
+        });
+        listeners.forEach(function (l) {
+            server.addListener('request', l);
+        });
 
         function tobi(req, res) {
             res.end('tobi');
@@ -111,10 +120,9 @@ describe('vhost(hostname, server)', function () {
             res.end('loki');
         }
 
-        request(app)
+        request(server)
             .get('/')
-            .unset('Host')
-            .expect(404, done);
+            .expect(404, 'no vhost for "undefined"', done);
     });
 
     describe('arguments', function () {
@@ -277,7 +285,7 @@ function createServer(hostname, server, pretest) {
 
             if (!vhost || err) {
                 res.statusCode = err ? (err.status || 500) : 404;
-                res.end(err ? err.message : 'oops');
+                res.end(err ? err.message : `no vhost for "${req.headers.host}"`);
                 return;
             }