diff --git a/test/se/vidstige/jadb/test/MockedTestCases.java b/test/se/vidstige/jadb/test/MockedTestCases.java
index 25a75da..b54ebd6 100644
--- a/test/se/vidstige/jadb/test/MockedTestCases.java
+++ b/test/se/vidstige/jadb/test/MockedTestCases.java
@@ -17,7 +17,7 @@ public class MockedTestCases {
 
     @Before
     public void setUp() throws Exception{
-        server = new AdbServer();
+        server = new AdbServer(15037);
         server.start();
         connection = new JadbConnection("localhost", 15037);
     }
diff --git a/test/se/vidstige/jadb/test/fakes/AdbServer.java b/test/se/vidstige/jadb/test/fakes/AdbServer.java
index 63afbe9..28288b4 100644
--- a/test/se/vidstige/jadb/test/fakes/AdbServer.java
+++ b/test/se/vidstige/jadb/test/fakes/AdbServer.java
@@ -7,7 +7,8 @@ import java.net.Socket;
 // >set ANDROID_ADB_SERVER_PORT=15037
 public class AdbServer implements Runnable {
 
-	private int port = 15037;
+    private static final int DEFAULT_PORT = 15037;
+	private final int port;
 	private ServerSocket socket;
 	private Thread thread;
 	private final Object lockObject = new Object();
@@ -17,6 +18,15 @@ public class AdbServer implements Runnable {
 		AdbServer server = new AdbServer();
 		server.run();
 	}
+
+    public AdbServer()
+    {
+        this(DEFAULT_PORT);
+    }
+    public AdbServer(int port)
+    {
+        this.port = port;
+    }
 		
 	public void start() throws InterruptedException
 	{