diff --git a/GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme b/GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Bot.xcscheme
similarity index 75%
rename from GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
rename to GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Bot.xcscheme
index 936effb..d4be962 100644
--- a/GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
+++ b/GCDTelnetServer.xcodeproj/xcshareddata/xcschemes/Bot.xcscheme
@@ -8,7 +8,7 @@
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
             buildForAnalyzing = "YES">
@@ -25,7 +25,7 @@
    <TestAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "NO"
       buildConfiguration = "Debug">
       <Testables>
          <TestableReference
@@ -48,6 +48,18 @@
             ReferencedContainer = "container:GCDTelnetServer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "DYLD_INSERT_LIBRARIES"
+            value = "/usr/lib/libgmalloc.dylib"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -58,15 +70,6 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E298C46B19ED859F00C76821"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "GCDTelnetServer (Tests)"
-            ReferencedContainer = "container:GCDTelnetServer.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -76,18 +79,9 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E298C46B19ED859F00C76821"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "GCDTelnetServer (Tests)"
-            ReferencedContainer = "container:GCDTelnetServer.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug">
+      buildConfiguration = "Release">
    </AnalyzeAction>
    <ArchiveAction
       buildConfiguration = "Release"
diff --git a/Run-Tests.sh b/Run-Tests.sh
index 8814054..6ff5aaf 100755
--- a/Run-Tests.sh
+++ b/Run-Tests.sh
@@ -36,7 +36,7 @@ rm -rf "$BUILD_DIR"
 xcodebuild -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION" build "SYMROOT=$BUILD_DIR"
 
 # Run tests
-xcodebuild test -scheme "Tests"
+xcodebuild test -scheme "Bot"
 
 # Done
 echo "\nAll tests completed successfully!"
diff --git a/Tests/GCDTelnetServer_Tests.m b/Tests/GCDTelnetServer_Tests.m
index b2898f2..b74ce11 100644
--- a/Tests/GCDTelnetServer_Tests.m
+++ b/Tests/GCDTelnetServer_Tests.m
@@ -32,6 +32,7 @@
 
 #import "GCDTelnetServer.h"
 
+#define kTestPort 3333
 #define kCommunicationSleepDelay (100 * 1000)
 
 @interface GCDTelnetServer_Tests : XCTestCase
@@ -47,7 +48,7 @@ - (void)testCLIParsing {
 }
 
 - (void)testHandlers {
-  GCDTelnetServer* server = [[GCDTelnetServer alloc] initWithPort:4444 startHandler:^NSString*(GCDTelnetConnection* connection) {
+  GCDTelnetServer* server = [[GCDTelnetServer alloc] initWithPort:kTestPort startHandler:^NSString*(GCDTelnetConnection* connection) {
     return @"Hello World!\n";
   } lineHandler:^NSString *(GCDTelnetConnection* connection, NSString* line) {
     return [line stringByAppendingString:@"\n"];
@@ -55,7 +56,7 @@ - (void)testHandlers {
   XCTAssertTrue([server start]);
   
   XCTestExpectation* expectation = [self expectationWithDescription:nil];
-  [GCDTCPConnection connectAsynchronouslyToHost:@"localhost" port:4444 timeout:1.0 completion:^(GCDTCPConnection* connection) {
+  [GCDTCPConnection connectAsynchronouslyToHost:@"localhost" port:kTestPort timeout:1.0 completion:^(GCDTCPConnection* connection) {
     XCTAssertNotNil(connection);
     [connection open];