diff --git a/lib/faktory/client.rb b/lib/faktory/client.rb
index e622c02..5fcb995 100644
--- a/lib/faktory/client.rb
+++ b/lib/faktory/client.rb
@@ -54,6 +54,7 @@ def initialize(url: uri_from_env || "tcp://localhost:7419", debug: false, timeou
       super
       @debug = debug
       @location = URI(url)
+      @sock = nil
 
       open_socket
     end
diff --git a/test/client_test.rb b/test/client_test.rb
index e83c4b4..de4eb87 100644
--- a/test/client_test.rb
+++ b/test/client_test.rb
@@ -1,8 +1,6 @@
 require "helper"
 
 class ClientTest < Minitest::Test
-  Faktory::Client::DEFAULT_TIMEOUT = 1
-
   def teardown
     # Ensure that these tests aren't dependent on run order
     ENV["FAKTORY_PROVIDER"] = nil