diff --git a/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift b/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
index 9b96a2e..20df5d5 100644
--- a/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
+++ b/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
@@ -12,6 +12,7 @@ import XCTest
 class SocketPollingAcknowledgementTest: SocketAcknowledgementTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
-        testKind = .Acknowledgement
+        testKind = TestKind.Acknowledgement
+        openConnection(AbstractSocketTest.socket)
     }
 }
diff --git a/SocketIO-MacTests/SocketPollingEmitTest.swift b/SocketIO-MacTests/SocketPollingEmitTest.swift
index ccc5084..86bf015 100644
--- a/SocketIO-MacTests/SocketPollingEmitTest.swift
+++ b/SocketIO-MacTests/SocketPollingEmitTest.swift
@@ -12,6 +12,7 @@ import XCTest
 class SocketPollingEmitTest: SocketEmitTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
-        testKind = .Emit
+        testKind = TestKind.Emit
+        openConnection(AbstractSocketTest.socket)
     }
 }
diff --git a/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift b/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
index ea40549..d8be953 100644
--- a/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
+++ b/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
@@ -12,6 +12,7 @@ import XCTest
 class SocketPollingNamespaceAcknowledgementTest: SocketNamespaceAcknowledgementTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
-        testKind = .Acknowledgement
+        testKind = TestKind.Acknowledgement
+        openConnection(AbstractSocketTest.socket)
     }
 }
\ No newline at end of file
diff --git a/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift b/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
index e85ddc7..4e6b8de 100644
--- a/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
+++ b/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
@@ -12,6 +12,7 @@ import XCTest
 class SocketPollingNamespaceEmitTest: SocketNamespaceEmitTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
-        testKind = .Emit
+        testKind = TestKind.Emit
+        openConnection(AbstractSocketTest.socket)
     }
 }
\ No newline at end of file
diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index b444be7..4d3ff3e 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -13,25 +13,13 @@ class AbstractSocketTest: XCTestCase {
     static let TEST_TIMEOUT = 5.0
     static var socket: SocketIOClient!
     static let regularSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL)
+    
     static let regularPollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
         opts: ["forcePolling": true])
-    static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
-        opts: ["nsp": "/swift"])
-    static let namespacePollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
-        opts: ["forsePolling": true, "nsp": "/swift"])
+    static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: ["nsp": "/swift"])
+    static let namespacePollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: ["forsePolling": true,"nsp": "/swift"])
     var testKind:TestKind?
     
-    override func setUp() {
-        connectAll()
-    }
-    
-    func connectAll() {
-        openConnection(AbstractSocketTest.namespacePollingSocket)
-        openConnection(AbstractSocketTest.regularSocket)
-        openConnection(AbstractSocketTest.regularPollingSocket)
-        openConnection(AbstractSocketTest.namespaceSocket)
-    }
-    
     func openConnection(socket: SocketIOClient) {
         guard socket.status == SocketIOClientStatus.NotConnected else {return}
         
diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
index 77ea444..3beba03 100644
--- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
@@ -13,7 +13,8 @@ class SocketAcknowledgementTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.regularSocket
-        testKind = .Acknowledgement
+        testKind = TestKind.Acknowledgement
+        openConnection(AbstractSocketTest.socket)
     }
 
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index aee0430..c653c0f 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -13,7 +13,8 @@ class SocketEmitTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.regularSocket
-        testKind = .Emit
+        testKind = TestKind.Emit
+        openConnection(AbstractSocketTest.socket)
     }
     
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
index 98b585c..109e8c3 100644
--- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
@@ -9,10 +9,12 @@
 import XCTest
 
 class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
+
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
-        testKind = .Acknowledgement
+        testKind = TestKind.Acknowledgement
+        openConnection(AbstractSocketTest.socket)
     }
     
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
index 6c04cf1..508e4bc 100644
--- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
@@ -9,10 +9,12 @@
 import XCTest
 
 class SocketNamespaceEmitTest: AbstractSocketTest {
+    
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
-        testKind = .Emit
+        testKind = TestKind.Emit
+        openConnection(AbstractSocketTest.socket)
     }
 
     func testConnectionStatus() {