diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index 62c6e7a..1fd61c2 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -9,7 +9,8 @@
 import XCTest
 
 class AbstractSocketTest: XCTestCase {
-    static let serverURL = "milkbartube.com:6979"
+    static let testLocal = false
+    static let serverURL = AbstractSocketTest.testLocal ? "localhost:6979" : "milkbartube.com:6979"
     static let TEST_TIMEOUT = 8.0
     static var socket:SocketIOClient!
     var testKind:TestKind?
@@ -22,6 +23,7 @@ class AbstractSocketTest: XCTestCase {
         XCTAssertTrue(AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected)
         AbstractSocketTest.socket.on("connect") {data, ack in
             XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected)
+            XCTAssertFalse(AbstractSocketTest.socket.secure)
             if let expection = expection {
                 expection.fulfill()
             }
diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
index 045d32e..0f1f425 100644
--- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
@@ -21,6 +21,8 @@ class SocketAcknowledgementTest: AbstractSocketTest {
             "forcePolling": false,
             "forceWebsockets": false,// default false
             "path": ""])
+        }else {
+            AbstractSocketTest.socket.leaveNamespace()
         }
         
         openConnection()
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index 958f241..5e58491 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -22,6 +22,8 @@ class SocketEmitTest: AbstractSocketTest {
                 "forceWebsockets": false,// default false
                 "path": ""]
             )
+        }else {
+            AbstractSocketTest.socket.leaveNamespace()
         }
         
         openConnection()
diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
index a7ae5b9..a0604f3 100644
--- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
@@ -22,6 +22,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
             "forceWebsockets": false,// default false
             "path": "",
             "nsp": "/swift"])
+        }else {
+            AbstractSocketTest.socket.joinNamespace("/swift")
         }
         
         openConnection()
diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
index cac2fe9..e02ede3 100644
--- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
@@ -22,6 +22,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
             "forceWebsockets": false,// default false
             "path": "",
             "nsp": "/swift"])
+        }else {
+            AbstractSocketTest.socket.joinNamespace("/swift")
         }
         
         openConnection()