diff --git a/beat/core/dock.py b/beat/core/dock.py
index 333de89da1436768bb9348d58df9620d59fcce5a..c5151887d18d941413151ee7e2aeaf363661a879 100755
--- a/beat/core/dock.py
+++ b/beat/core/dock.py
@@ -64,11 +64,11 @@ class Host(object):
     self.environments = {}
 
 
-  def setup(self):
+  def setup(self, raise_on_errors=True):
 
     self.client = docker.Client(**self.kwargs)
 
-    self.environments = self._discover_environments(raise_on_errors=False)
+    self.environments = self._discover_environments(raise_on_errors)
 
 
   def __contains__(self, key):
diff --git a/beat/core/test/test_docker.py b/beat/core/test/test_docker.py
index 7ac27577154898ef8508292a7f3d93339d84f7cd..96237c12b753d95ca87e3841eb54434e779f6891 100755
--- a/beat/core/test/test_docker.py
+++ b/beat/core/test/test_docker.py
@@ -56,7 +56,7 @@ class AsyncTest(unittest.TestCase):
   @classmethod
   def setUpClass(cls):
     cls.host = Host()
-    cls.host.setup()
+    cls.host.setup(raise_on_errors=False)
 
 
   @classmethod
diff --git a/beat/core/test/test_execution.py b/beat/core/test/test_execution.py
index 3503fbbf0d52bf0740f98e85bbe0126935603436..7f384fa47a6004c9d4b0c4356954e92f178fa80e 100644
--- a/beat/core/test/test_execution.py
+++ b/beat/core/test/test_execution.py
@@ -60,7 +60,7 @@ class TestExecution(unittest.TestCase):
   @classmethod
   def setUpClass(cls):
     cls.host = Host()
-    cls.host.setup()
+    cls.host.setup(raise_on_errors=False)
 
 
   @classmethod