diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
index 8e01bee..de7f091 100644
--- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
+++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
 		5764DFA01B51F254004FF46E /* SwiftRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5764DF871B51F254004FF46E /* SwiftRegex.swift */; };
 		5764DFA11B51F254004FF46E /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5764DF881B51F254004FF46E /* WebSocket.swift */; };
 		5764DFA21B51F254004FF46E /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5764DF881B51F254004FF46E /* WebSocket.swift */; };
+		743AC41D1BB9A7A7009F615E /* SocketPollingEmitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 743AC41C1BB9A7A7009F615E /* SocketPollingEmitTest.swift */; settings = {ASSET_TAGS = (); }; };
 		745895381BB59A0A0050ACC8 /* SocketAckManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A20D601B99E22F00BF9E44 /* SocketAckManagerTest.swift */; };
 		745895391BB59A0A0050ACC8 /* SocketAcknowledgementTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ADAC4A1B6632DD00FD79AE /* SocketAcknowledgementTest.swift */; };
 		7458953A1BB59A0A0050ACC8 /* SocketEmitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945B65421B63D9DB0081E995 /* SocketEmitTest.swift */; };
@@ -136,6 +137,7 @@
 		5764DF861B51F254004FF46E /* SocketTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketTypes.swift; path = SocketIOClientSwift/SocketTypes.swift; sourceTree = "<group>"; };
 		5764DF871B51F254004FF46E /* SwiftRegex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftRegex.swift; path = SocketIOClientSwift/SwiftRegex.swift; sourceTree = "<group>"; };
 		5764DF881B51F254004FF46E /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = SocketIOClientSwift/WebSocket.swift; sourceTree = "<group>"; };
+		743AC41C1BB9A7A7009F615E /* SocketPollingEmitTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketPollingEmitTest.swift; sourceTree = "<group>"; };
 		74781D591B7E83930042CACA /* SocketIOClientStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketIOClientStatus.swift; path = SocketIOClientSwift/SocketIOClientStatus.swift; sourceTree = "<group>"; };
 		749A7F8A1BA9D42D00782993 /* SocketAckEmitter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketAckEmitter.swift; path = SocketIOClientSwift/SocketAckEmitter.swift; sourceTree = "<group>"; };
 		74D765611B9F0D870028551C /* SocketStringReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SocketStringReader.swift; path = SocketIOClientSwift/SocketStringReader.swift; sourceTree = "<group>"; };
@@ -263,6 +265,7 @@
 				94A20D601B99E22F00BF9E44 /* SocketAckManagerTest.swift */,
 				94ADAC4A1B6632DD00FD79AE /* SocketAcknowledgementTest.swift */,
 				945B65421B63D9DB0081E995 /* SocketEmitTest.swift */,
+				743AC41C1BB9A7A7009F615E /* SocketPollingEmitTest.swift */,
 				94242BB71B67B0E500AAAC9D /* SocketNamespaceAcknowledgementTest.swift */,
 				94ADAC481B652D3300FD79AE /* SocketNamespaceEmitTest.swift */,
 				949FAE8C1B9B94E600073BE9 /* SocketParserTest.swift */,
@@ -577,6 +580,7 @@
 				7458953C1BB59A0A0050ACC8 /* SocketNamespaceAcknowledgementTest.swift in Sources */,
 				7458953D1BB59A0A0050ACC8 /* SocketParserTest.swift in Sources */,
 				7458953E1BB59A0A0050ACC8 /* SocketTestCases.swift in Sources */,
+				743AC41D1BB9A7A7009F615E /* SocketPollingEmitTest.swift in Sources */,
 				7458953F1BB59A0A0050ACC8 /* AbstractSocketTest.swift in Sources */,
 				745895401BB59A0A0050ACC8 /* TestKind.swift in Sources */,
 				749A7F901BA9D42D00782993 /* SocketAckEmitter.swift in Sources */,
diff --git a/SocketIO-MacTests/SocketPollingEmitTest.swift b/SocketIO-MacTests/SocketPollingEmitTest.swift
new file mode 100644
index 0000000..86bf015
--- /dev/null
+++ b/SocketIO-MacTests/SocketPollingEmitTest.swift
@@ -0,0 +1,18 @@
+//
+//  SocketPollingEmitTest.swift
+//  Socket.IO-Client-Swift
+//
+//  Created by Erik Little on 9/28/15.
+//
+//
+
+import Foundation
+import XCTest
+
+class SocketPollingEmitTest: SocketEmitTest {
+    override func setUp() {
+        AbstractSocketTest.socket = AbstractSocketTest.regularPollingSocket
+        testKind = TestKind.Emit
+        openConnection(AbstractSocketTest.socket)
+    }
+}
diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index fbb8010..05d4ef1 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -12,23 +12,12 @@ class AbstractSocketTest: XCTestCase {
     static let serverURL = "localhost:6979"
     static let TEST_TIMEOUT = 3.0
     static var socket: SocketIOClient!
-    static let regularSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
-        "reconnects": true, // default true
-        "reconnectAttempts": -1, // default -1
-        "reconnectWait": 5, // default 10
-        "forcePolling": false,
-        "forceWebsockets": false,// default false
-        "path": ""]
-    )
+    static let regularSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL)
     
-    static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
-        "reconnects": true, // default true
-        "reconnectAttempts": -1, // default -1
-        "reconnectWait": 5, // default 10
-        "forcePolling": false,
-        "forceWebsockets": false,// default false
-        "path": "",
-        "nsp": "/swift"])
+    static let regularPollingSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL,
+        opts: ["forcePolling": true])
+    
+    static let namespaceSocket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: ["nsp": "/swift"])
     var testKind:TestKind?
     
     func openConnection(socket: SocketIOClient) {