diff --git a/circle.yml b/circle.yml
index 824c958..4595780 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,7 @@
 machine:
   environment:
     MC_SERVER_JAR_DIR: /home/ubuntu/node-minecraft-protocol/minecraft-server/
+    NODE_DEBUG: minecraft-protocol
   node:
     version: 4
   java:
diff --git a/test/clientTest.js b/test/clientTest.js
index bc1803c..3374c35 100644
--- a/test/clientTest.js
+++ b/test/clientTest.js
@@ -12,6 +12,7 @@ var download = require('minecraft-wrap').download;
 
 
 mc.supportedVersions.forEach(function(supportedVersion) {
+  var PORT=Math.round(30000+Math.random()*20000);
   var mcData = require("minecraft-data")(supportedVersion);
   var version = mcData.version;
   var MC_SERVER_JAR_DIR = process.env.MC_SERVER_JAR_DIR;
@@ -43,12 +44,14 @@ mc.supportedVersions.forEach(function(supportedVersion) {
       });
       wrap.startServer({
         motd: 'test1234',
-        'max-players': 120
+        'max-players': 120,
+        'server-port':PORT
       }, function(err) {
         if(err)
           return done(err);
         mc.ping({
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         }, function(err, results) {
           if(err) return done(err);
           assert.ok(results.latency >= 0);
@@ -67,13 +70,17 @@ mc.supportedVersions.forEach(function(supportedVersion) {
       });
     });
     it.skip("connects successfully - online mode", function(done) {
-      wrap.startServer({'online-mode': 'true'}, function(err) {
+      wrap.startServer({
+        'online-mode': 'true',
+        'server-port':PORT
+      }, function(err) {
         if(err)
           return done(err);
         var client = mc.createClient({
           username: process.env.MC_USERNAME,
           password: process.env.MC_PASSWORD,
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         var lineListener = function(line) {
           var match = line.match(/\[Server thread\/INFO\]: <(.+?)> (.+)/);
@@ -105,12 +112,16 @@ mc.supportedVersions.forEach(function(supportedVersion) {
       });
     });
     it("connects successfully - offline mode", function(done) {
-      wrap.startServer({'online-mode': 'false'}, function(err) {
+      wrap.startServer({
+        'online-mode': 'false',
+        'server-port':PORT
+      }, function(err) {
         if(err)
           return done(err);
         var client = mc.createClient({
           username: 'Player',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         var lineListener = function(line) {
           var match = line.match(/\[Server thread\/INFO\]: <(.+?)> (.+)/);
@@ -154,12 +165,16 @@ mc.supportedVersions.forEach(function(supportedVersion) {
       });
     });
     it("gets kicked when no credentials supplied in online mode", function(done) {
-      wrap.startServer({'online-mode': 'true'}, function(err) {
+      wrap.startServer({
+        'online-mode': 'true',
+        'server-port':PORT
+      }, function(err) {
         if(err)
           return done(err);
         var client = mc.createClient({
           username: 'Player',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         var gotKicked = false;
         client.on('disconnect', function(packet) {
@@ -173,12 +188,16 @@ mc.supportedVersions.forEach(function(supportedVersion) {
       });
     });
     it("does not crash for " + SURVIVE_TIME + "ms", function(done) {
-      wrap.startServer({'online-mode': 'false'}, function(err) {
+      wrap.startServer({
+        'online-mode': 'false',
+        'server-port':PORT
+      }, function(err) {
         if(err)
           return done(err);
         var client = mc.createClient({
           username: 'Player',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         client.on("login", function(packet) {
           client.write("chat", {
diff --git a/test/packetTest.js b/test/packetTest.js
index 453dd2e..66a633c 100644
--- a/test/packetTest.js
+++ b/test/packetTest.js
@@ -144,6 +144,7 @@ function getValue(_type, packet) {
 
 
 mc.supportedVersions.forEach(function(supportedVersion){
+  var PORT=Math.round(30000+Math.random()*20000);
   var mcData=require("minecraft-data")(supportedVersion);
   var version=mcData.version;
   var packets = mcData.protocol;
@@ -158,9 +159,9 @@ mc.supportedVersions.forEach(function(supportedVersion){
           done();
         });
         client = new Client(false,version.minecraftVersion);
-        client.setSocket(net.connect(45000, 'localhost'));
+        client.setSocket(net.connect(PORT, 'localhost'));
       });
-      server.listen(45000, 'localhost');
+      server.listen(PORT, 'localhost');
     });
     after(function(done) {
       client.on('end', function() {
diff --git a/test/serverTest.js b/test/serverTest.js
index b4102d0..0353674 100644
--- a/test/serverTest.js
+++ b/test/serverTest.js
@@ -2,6 +2,7 @@ var mc = require('../');
 var assert = require('power-assert');
 
 mc.supportedVersions.forEach(function(supportedVersion){
+  var PORT=Math.round(30000+Math.random()*20000);
   var mcData=require("minecraft-data")(supportedVersion);
   var version=mcData.version;
 
@@ -9,7 +10,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
     it("starts listening and shuts down cleanly", function(done) {
       var server = mc.createServer({
         'online-mode': false,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var listening = false;
       server.on('listening', function() {
@@ -26,7 +28,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
         'online-mode': false,
         kickTimeout: 100,
         checkTimeoutInterval: 10,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var count = 2;
       server.on('connection', function(client) {
@@ -43,7 +46,7 @@ mc.supportedVersions.forEach(function(supportedVersion){
         client.on('end', function() {
           resolve();
         });
-        client.connect(25565, '127.0.0.1');
+        client.connect(PORT, '127.0.0.1');
       });
 
       function resolve() {
@@ -56,7 +59,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
         'online-mode': false,
         kickTimeout: 100,
         checkTimeoutInterval: 10,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var count = 2;
       server.on('connection', function(client) {
@@ -72,7 +76,7 @@ mc.supportedVersions.forEach(function(supportedVersion){
         var client = mc.createClient({
           username: 'superpants',
           host: '127.0.0.1',
-          port: 25565,
+          port: PORT,
           keepAlive: false,
           version: version.minecraftVersion
         });
@@ -90,12 +94,14 @@ mc.supportedVersions.forEach(function(supportedVersion){
         'online-mode': false,
         motd: 'test1234',
         'max-players': 120,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       server.on('listening', function() {
         mc.ping({
           host: '127.0.0.1',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         }, function(err, results) {
           if(err) return done(err);
           assert.ok(results.latency >= 0);
@@ -121,7 +127,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
     it("clients can log in and chat", function(done) {
       var server = mc.createServer({
         'online-mode': false,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var username = ['player1', 'player2'];
       var index = 0;
@@ -152,7 +159,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
         var player1 = mc.createClient({
           username: 'player1',
           host: '127.0.0.1',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         player1.on('login', function(packet) {
           assert.strictEqual(packet.gameMode, 1);
@@ -184,7 +192,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
           var player2 = mc.createClient({
             username: 'player2',
             host: '127.0.0.1',
-            version: version.minecraftVersion
+            version: version.minecraftVersion,
+            port:PORT
           });
         });
       });
@@ -202,7 +211,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
     it("kicks clients when invalid credentials", function(done) {
       this.timeout(10000);
       var server = mc.createServer({
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var count = 4;
       server.on('connection', function(client) {
@@ -219,7 +229,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
         var client = mc.createClient({
           username: 'lalalal',
           host: "127.0.0.1",
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         client.on('end', function() {
           resolve();
@@ -233,7 +244,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
     it("gives correct reason for kicking clients when shutting down", function(done) {
       var server = mc.createServer({
         'online-mode': false,
-        version: version.minecraftVersion
+        version: version.minecraftVersion,
+        port:PORT
       });
       var count = 2;
       server.on('login', function(client) {
@@ -258,7 +270,8 @@ mc.supportedVersions.forEach(function(supportedVersion){
         var client = mc.createClient({
           username: 'lalalal',
           host: '127.0.0.1',
-          version: version.minecraftVersion
+          version: version.minecraftVersion,
+          port:PORT
         });
         client.on('login', function() {
           server.close();