diff --git a/lib/cdist/test/explorer/__init__.py b/lib/cdist/test/explorer/__init__.py
index e6858812..fe23b7e2 100644
--- a/lib/cdist/test/explorer/__init__.py
+++ b/lib/cdist/test/explorer/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -62,7 +63,7 @@ class ExplorerClassTestCase(unittest.TestCase):
 
         self.explorer = explorer.Explorer(self.target_host, self.local, self.remote)
 
-        self.log = logging.getLogger("cdist")
+        self.log = logging.getLogger(self.target_host)
 
     def tearDown(self):
         shutil.rmtree(self.out_path)
diff --git a/lib/cdist/test/manifest/__init__.py b/lib/cdist/test/manifest/__init__.py
index 86885a59..efda5b0a 100644
--- a/lib/cdist/test/manifest/__init__.py
+++ b/lib/cdist/test/manifest/__init__.py
@@ -55,7 +55,7 @@ class ManifestTestCase(unittest.TestCase):
         self.local.create_directories()
         self.local.link_emulator(cdist.test.cdist_exec_path)
         self.manifest = manifest.Manifest(self.target_host, self.local)
-        self.log = logging.getLogger("cdist")
+        self.log = logging.getLogger(self.target_host)
 
     def tearDown(self):
         shutil.rmtree(self.temp_dir)