diff --git a/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift b/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
index 20df5d5..9b96a2e 100644
--- a/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
+++ b/SocketIO-MacTests/SocketPollingAcknowledgementTest.swift
@@ -12,7 +12,6 @@ import XCTest
 class SocketPollingAcknowledgementTest: SocketAcknowledgementTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
-        testKind = TestKind.Acknowledgement
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Acknowledgement
     }
 }
diff --git a/SocketIO-MacTests/SocketPollingEmitTest.swift b/SocketIO-MacTests/SocketPollingEmitTest.swift
index 86bf015..ccc5084 100644
--- a/SocketIO-MacTests/SocketPollingEmitTest.swift
+++ b/SocketIO-MacTests/SocketPollingEmitTest.swift
@@ -12,7 +12,6 @@ import XCTest
 class SocketPollingEmitTest: SocketEmitTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
-        testKind = TestKind.Emit
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Emit
     }
 }
diff --git a/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift b/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
index d8be953..ea40549 100644
--- a/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
+++ b/SocketIO-MacTests/SocketPollingNamespaceAcknowledgementTest.swift
@@ -12,7 +12,6 @@ import XCTest
 class SocketPollingNamespaceAcknowledgementTest: SocketNamespaceAcknowledgementTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
-        testKind = TestKind.Acknowledgement
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Acknowledgement
     }
 }
\ No newline at end of file
diff --git a/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift b/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
index 4e6b8de..e85ddc7 100644
--- a/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
+++ b/SocketIO-MacTests/SocketPollingNamespaceEmitTest.swift
@@ -12,7 +12,6 @@ import XCTest
 class SocketPollingNamespaceEmitTest: SocketNamespaceEmitTest {
     override func setUp() {
         AbstractSocketTest.socket = AbstractSocketTest.namespacePollingSocket
-        testKind = TestKind.Emit
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Emit
     }
 }
\ No newline at end of file
diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index 4d3ff3e..b444be7 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -13,13 +13,25 @@ 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 3beba03..77ea444 100644
--- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
@@ -13,8 +13,7 @@ class SocketAcknowledgementTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.regularSocket
-        testKind = TestKind.Acknowledgement
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Acknowledgement
     }
 
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index c653c0f..aee0430 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -13,8 +13,7 @@ class SocketEmitTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.regularSocket
-        testKind = TestKind.Emit
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Emit
     }
     
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
index 109e8c3..98b585c 100644
--- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
@@ -9,12 +9,10 @@
 import XCTest
 
 class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
-
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
-        testKind = TestKind.Acknowledgement
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Acknowledgement
     }
     
     func testConnectionStatus() {
diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
index 508e4bc..6c04cf1 100644
--- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
@@ -9,12 +9,10 @@
 import XCTest
 
 class SocketNamespaceEmitTest: AbstractSocketTest {
-    
     override func setUp() {
         super.setUp()
         AbstractSocketTest.socket = AbstractSocketTest.namespaceSocket
-        testKind = TestKind.Emit
-        openConnection(AbstractSocketTest.socket)
+        testKind = .Emit
     }
 
     func testConnectionStatus() {