diff --git a/lib/test.js b/lib/test.js
index 6ad9c890..9e4b42bb 100644
--- a/lib/test.js
+++ b/lib/test.js
@@ -7,6 +7,7 @@ var util = require('util');
 var http = require('http');
 var https = require('https');
 var assert = require('assert');
+var url = require('url');
 var Request = request.Request;
 
 /**
@@ -59,7 +60,7 @@ Test.prototype.serverAddress = function(app, path, host) {
   if (!addr) this._server = app.listen(0);
   port = app.address().port;
   protocol = app instanceof https.Server ? 'https' : 'http';
-  return protocol + '://' + (host || '127.0.0.1') + ':' + port + path;
+  return url.resolve(protocol + '://' + (host || '127.0.0.1') + ':' + port, path);
 };
 
 /**