diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
index 75f5ac1..041d1bb 100644
--- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
+++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
 		945B65401B5FCEEA0081E995 /* SwiftRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5764DF871B51F254004FF46E /* SwiftRegex.swift */; };
 		945B65411B5FCEEA0081E995 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5764DF881B51F254004FF46E /* WebSocket.swift */; };
 		945B65431B63D9DB0081E995 /* SocketEmitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945B65421B63D9DB0081E995 /* SocketEmitTest.swift */; };
+		94ADAC491B652D3300FD79AE /* SocketNamespaceEmitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ADAC481B652D3300FD79AE /* SocketNamespaceEmitTest.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,6 +98,7 @@
 		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>"; };
 		945B65421B63D9DB0081E995 /* SocketEmitTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketEmitTest.swift; sourceTree = "<group>"; };
+		94ADAC481B652D3300FD79AE /* SocketNamespaceEmitTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketNamespaceEmitTest.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -178,6 +180,7 @@
 			children = (
 				945B65421B63D9DB0081E995 /* SocketEmitTest.swift */,
 				572EF2291B51F16C00EEBB58 /* Supporting Files */,
+				94ADAC481B652D3300FD79AE /* SocketNamespaceEmitTest.swift */,
 			);
 			path = "SocketIO-iOSTests";
 			sourceTree = "<group>";
@@ -450,6 +453,7 @@
 				945B65361B5FCEEA0081E995 /* SocketAnyEvent.swift in Sources */,
 				945B653F1B5FCEEA0081E995 /* SocketTypes.swift in Sources */,
 				945B653B1B5FCEEA0081E995 /* SocketIOClient.swift in Sources */,
+				94ADAC491B652D3300FD79AE /* SocketNamespaceEmitTest.swift in Sources */,
 				945B65411B5FCEEA0081E995 /* WebSocket.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index d2866d6..d669070 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -39,7 +39,7 @@ class SocketEmitTest: XCTestCase {
     }
     
     override func tearDown() {
-
+        socket.close(fast: false)
         super.tearDown()
     }
     
diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
new file mode 100644
index 0000000..8e50c11
--- /dev/null
+++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
@@ -0,0 +1,89 @@
+//
+//  SocketNamespaceEmitTest.swift
+//  Socket.IO-Client-Swift
+//
+//  Created by Lukas Schmidt on 26.07.15.
+//
+//
+
+import XCTest
+
+class SocketNamespaceEmitTest: SocketEmitTest {
+    
+    override func setUp() {
+        super.setUp()
+        if testCytube {
+            socket = SocketIOClient(socketURL: "https://cytu.be:10443", opts: [
+                "forcePolling": false,
+                "forceWebsockets": false,
+                "log": true
+                ])
+        } else {
+            socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [
+                "reconnects": true, // default true
+                "reconnectAttempts": -1, // default -1
+                "reconnectWait": 5, // default 10
+                "forcePolling": false,
+                "forceWebsockets": false,// default false
+                "path": "",
+                "nsp": "/swift",
+                "extraHeaders": headers])
+        }
+        openConnection()
+        
+    }
+    
+    override func tearDown() {
+        socket.close(fast: false)
+        super.tearDown()
+    }
+    
+    override func testConnectionStatus() {
+       super.testConnectionStatus()
+    }
+    
+    override func testEmit() {
+        super.testEmit()
+    }
+    
+    override func testEmitNull() {
+        super.testEmitNull()
+    }
+    
+    override func testEmitBinary() {
+       super.testEmitBinary()
+    }
+    
+    override func testArrayEmit() {
+       super.testArrayEmit()
+    }
+    
+    override func testStringEmit() {
+       super.testStringEmit()
+    }
+    
+    override func testBoolEmit() {
+        super.testBoolEmit()
+    }
+    
+    override func testIntegerEmit() {
+        super.testIntegerEmit()
+    }
+    
+    override func testDoubleEmit() {
+        super.testDoubleEmit()
+    }
+    
+    override func testJSONEmit() {
+        super.testJSONEmit()
+    }
+    
+    override func testUnicodeEmit() {
+       super.testUnicodeEmit()
+    }
+    
+    override func testMultipleItemsEmit() {
+       super.testMultipleItemsEmit()
+    }
+    
+}