diff --git a/test/ringo/websocket_test.js b/test/ringo/websocket_test.js
index f5b16600b..6f891c506 100644
--- a/test/ringo/websocket_test.js
+++ b/test/ringo/websocket_test.js
@@ -22,7 +22,7 @@ exports.testTextMessage = function() {
             "isAsync": isAsync
         }, true);
 
-        if (!semaphore.tryWait(20000)) {
+        if (!semaphore.tryWait(2000)) {
             assert.fail("web socket text timed out");
         }
         assert.equal(received, message);
@@ -45,7 +45,7 @@ exports.testBinaryMessage = function() {
             "isAsync": isAsync
         }, true);
 
-        if (!semaphore.tryWait(20000)) {
+        if (!semaphore.tryWait(2000)) {
             assert.fail("web socket binary timed out");
         }
         assert.isTrue(Arrays.equals(received, message));
diff --git a/test/ringo/websocket_worker.js b/test/ringo/websocket_worker.js
index 52b7b476a..d26632f07 100644
--- a/test/ringo/websocket_worker.js
+++ b/test/ringo/websocket_worker.js
@@ -8,7 +8,7 @@ var {Server} = require("ringo/httpserver");
 require('ringo/logging').setConfig(getResource('./httptest_log4j.properties'));
 
 var host = "127.0.0.1";
-var port = "8282";
+var port = "4400";
 var path = "/websocket";
 var uri = "ws://" + host + ":" + port + path;