2 files changed, 23 insertions, 1 deletions
diff --git a/test/integration/hkp_test.rb b/test/integration/hkp_test.rb
index cbb8190..586b3ab 100644
--- a/test/integration/hkp_test.rb
+++ b/test/integration/hkp_test.rb
@@ -1,9 +1,21 @@
 require 'test_helper'
 require 'nickserver/hkp/source'
 require 'nickserver/adapters/celluloid_http'
+require 'celluloid/test'
 
 class HkpTest < Minitest::Test
 
+  def setup
+    super
+    Celluloid.boot
+  end
+
+  def teardown
+    Celluloid.shutdown
+    super
+  end
+
+
   def test_key_info_expired
     fetch_key_info(:hkp_vindex_result, 'lemur@leap.se') do |keys|
       assert_equal 1, keys.length, 'should find a single key'
diff --git a/test/unit/adapters/celluloid_http_test.rb b/test/unit/adapters/celluloid_http_test.rb
index 64c7a5d..c3c58b1 100644
--- a/test/unit/adapters/celluloid_http_test.rb
+++ b/test/unit/adapters/celluloid_http_test.rb
@@ -1,9 +1,19 @@
 require 'test_helper'
 require 'nickserver/adapters/celluloid_http'
-require 'byebug'
+require 'celluloid/test'
 
 class Nickserver::Adapters::CelluloidHttpTest < Minitest::Test
 
+  def setup
+    super
+    Celluloid.boot
+  end
+
+  def teardown
+    Celluloid.shutdown
+    super
+  end
+
   def test_successful_request
     url = 'http://url.to'
     stub_http_request(:get, url)