diff --git a/unleash-server/package.json b/unleash-server/package.json
index f6ffa4b786..470b56d4c1 100644
--- a/unleash-server/package.json
+++ b/unleash-server/package.json
@@ -29,6 +29,8 @@
         "db-setup": "npm run db-create; npm run db-migrate-up"
     },
     "dependencies": {
+        "any-db": "2.1.0",
+        "any-db-postgres": "2.1.3",
         "bluebird": "2.2.2",
         "body-parser": "1.4.3",
         "db-migrate": "^0.7.1",
@@ -39,8 +41,7 @@
         "log4js": "0.6.21",
         "nconf": "0.6.9",
         "pg": "^3.6.1",
-        "any-db": "2.1.0",
-        "any-db-postgres": "2.1.3"
+        "portfinder": "^0.2.1"
     },
     "devDependencies": {
         "chai": "1.9.1",
@@ -52,4 +53,4 @@
         "xmlbuilder": "^2.4.4",
         "mockery": "1.4.0"
     }
-}
\ No newline at end of file
+}
diff --git a/unleash-server/test/featureApiSpec.js b/unleash-server/test/featureApiSpec.js
index 8554518b76..927c5947ce 100644
--- a/unleash-server/test/featureApiSpec.js
+++ b/unleash-server/test/featureApiSpec.js
@@ -1,7 +1,5 @@
 var request = require('supertest'),
-    mockery = require('mockery'),
-
-request = request('http://localhost:4242');
+    mockery = require('mockery');
 
 describe('The api', function () {
     var server;
@@ -16,8 +14,8 @@ describe('The api', function () {
         mockery.registerSubstitute('./eventDb', '../test/eventDbMock');
         mockery.registerSubstitute('./featureDb', '../test/featureDbMock');
 
-
         server = require('../server');
+        request = request('http://localhost:' + server.app.get('port'));
     });
 
     after(function () {