diff --git a/src/collective/liveblog/testing.py b/src/collective/liveblog/testing.py
index e11d597..85fc098 100644
--- a/src/collective/liveblog/testing.py
+++ b/src/collective/liveblog/testing.py
@@ -12,13 +12,11 @@ class Fixture(PloneSandboxLayer):
     defaultBases = (PLONE_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
-        # Load ZCML
         import collective.liveblog
         self.loadZCML(package=collective.liveblog)
 
     def setUpPloneSite(self, portal):
-        self.applyProfile(
-            portal, 'collective.liveblog:default')
+        self.applyProfile(portal, 'collective.liveblog:default')
 
 
 FIXTURE = Fixture()
diff --git a/src/collective/liveblog/tests/test_adapters.py b/src/collective/liveblog/tests/test_adapters.py
index a46154a..f877584 100644
--- a/src/collective/liveblog/tests/test_adapters.py
+++ b/src/collective/liveblog/tests/test_adapters.py
@@ -15,8 +15,8 @@ class ContentTypeTestCase(unittest.TestCase):
     def setUp(self):
         self.portal = self.layer['portal']
         with api.env.adopt_roles(['Manager']):
-            self.folder = api.content.create(self.portal, 'Folder', 'test')
-        self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
+            self.liveblog = api.content.create(
+                self.portal, 'Liveblog', 'liveblog')
 
     def test_adding(self):
         adapter = IMicroUpdateContainer(self.liveblog)
diff --git a/src/collective/liveblog/tests/test_liveblog.py b/src/collective/liveblog/tests/test_liveblog.py
index b8676ed..f93bd21 100644
--- a/src/collective/liveblog/tests/test_liveblog.py
+++ b/src/collective/liveblog/tests/test_liveblog.py
@@ -18,8 +18,8 @@ class ContentTypeTestCase(unittest.TestCase):
     def setUp(self):
         self.portal = self.layer['portal']
         with api.env.adopt_roles(['Manager']):
-            self.folder = api.content.create(self.portal, 'Folder', 'test')
-        self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
+            self.liveblog = api.content.create(
+                self.portal, 'Liveblog', 'liveblog')
 
     def test_adding(self):
         self.assertTrue(ILiveblog.providedBy(self.liveblog))
diff --git a/src/collective/liveblog/tests/test_views.py b/src/collective/liveblog/tests/test_views.py
index ee55cc4..9cd2637 100644
--- a/src/collective/liveblog/tests/test_views.py
+++ b/src/collective/liveblog/tests/test_views.py
@@ -17,8 +17,8 @@ def setUp(self):
         self.request = self.layer['request']
         directlyProvides(self.request, IBrowserLayer)
         with api.env.adopt_roles(['Manager']):
-            self.folder = api.content.create(self.portal, 'Folder', 'test')
-        self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
+            self.liveblog = api.content.create(
+                self.portal, 'Liveblog', 'liveblog')
 
     def test_add_microupdate_no_parameters(self):
         # invoke the view and check the status message