diff --git a/ruby/lib/jam_ruby/lib/em_helper.rb b/ruby/lib/jam_ruby/lib/em_helper.rb
index cf7a65f2d..2e8c46c55 100644
--- a/ruby/lib/jam_ruby/lib/em_helper.rb
+++ b/ruby/lib/jam_ruby/lib/em_helper.rb
@@ -64,8 +64,6 @@ module JamWebEventMachine
 
   def self.run
     Thread.new do
-      #ActiveRecord::Base.connection.disconnect!
-      ActiveRecord::Base.establish_connection
       run_em
     end
   end
diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb
index 696735db7..b3f417864 100644
--- a/web/config/environments/test.rb
+++ b/web/config/environments/test.rb
@@ -43,7 +43,7 @@ SampleApp::Application.configure do
   # For testing omniauth
   OmniAuth.config.test_mode = true
 
-  config.websocket_gateway_enable = true
+  config.websocket_gateway_enable = false
   config.websocket_gateway_port = 6769
   config.websocket_gateway_uri = "ws://localhost:#{config.websocket_gateway_port}/websocket"
 
diff --git a/web/config/initializers/eventmachine.rb b/web/config/initializers/eventmachine.rb
index 594eec471..4585507d8 100644
--- a/web/config/initializers/eventmachine.rb
+++ b/web/config/initializers/eventmachine.rb
@@ -1,5 +1,3 @@
-
-
 unless $rails_rake_task
 
   JamWebEventMachine.start
@@ -15,5 +13,6 @@ unless $rails_rake_task
           :rabbitmq_host => APP_CONFIG.rabbitmq_host,
           :rabbitmq_port => APP_CONFIG.rabbitmq_port)
     end
+
   end
 end
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index 911e59084..921ee2935 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -22,7 +22,7 @@ ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.ym
 require 'jam_ruby'
 
 # uncomment this to see active record logs
- ActiveRecord::Base.logger = Logger.new(STDOUT) if defined?(ActiveRecord::Base)
+# ActiveRecord::Base.logger = Logger.new(STDOUT) if defined?(ActiveRecord::Base)
 
 include JamRuby
 # put ActionMailer into test mode
@@ -32,6 +32,7 @@ RecordedTrack.observers.disable :all # only a few tests want this observer activ
 # a way to kill tests if they aren't running. capybara is hanging intermittently, I think
 tests_started = false
 
+
 Thread.new {
   sleep 30
   unless tests_started
@@ -40,6 +41,27 @@ Thread.new {
   end
 }
 
+Thread.new do
+  ActiveRecord::Base.connection.disconnect!
+  ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))["test"])
+  require 'jam_websockets'
+  begin
+    JamWebsockets::Server.new.run(
+        :port => 6769,
+        :emwebsocket_debug =>  false,
+        :connect_time_stale => 2,
+        :connect_time_expire => 5,
+        :rabbitmq_host => 'localhost',
+        :rabbitmq_port => 5672)
+  rescue Exception => e
+    puts "websocket-gateway failed: #{e}"
+  end
+
+end
+
+
+ActiveRecord::Base.connection.disconnect!
+ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))["test"])
 #Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However,
   # if you change any configuration or code from libraries loaded here, you'll