diff --git a/CHANGES.txt b/CHANGES.txt
index 7fedca1..92243ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 2.0b2 (Unreleased)
 ------------------
 
+- Move all tests from testing layer to plone.app.testing.
+  [timo]
+
 - Move some policy out of the conversation storage adapter into a
   view, specifically "enabled()".  Prevents having to replace/migrate
   persistent objects to change policy which really only concerns the
@@ -29,6 +32,7 @@ Changelog
   sent.
   [davisagli]
 
+
 2.0b1 (2011-04-06)
 ------------------
 
@@ -76,6 +80,7 @@ Changelog
 - Added Afrikaans translations
   [jcbrand]
 
+
 2.0a3 (2011-03-02)
 ------------------
 
@@ -83,6 +88,7 @@ Changelog
   defaultUser.gif to defaultUser.png in Products.PlonePAS 4.0.5
   [maurits]
 
+
 2.0a2 (2011-02-08)
 ------------------
 
diff --git a/plone/app/discussion/tests/layer.py b/plone/app/discussion/tests/layer.py
deleted file mode 100644
index 718b7c7..0000000
--- a/plone/app/discussion/tests/layer.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from Testing import ZopeTestCase as ztc
-
-from Products.PloneTestCase import ptc
-from Products.PloneTestCase import layer
-from Products.Five import zcml
-from Products.Five import fiveconfigure
-
-ptc.setupPloneSite(
-    extension_profiles=('plone.app.discussion:default', )
-)
-
-class DiscussionLayer(layer.PloneSite):
-    """Configure plone.app.discussion"""
-
-    @classmethod
-    def setUp(cls):
-        fiveconfigure.debug_mode = True
-        import plone.app.discussion
-        zcml.load_config("configure.zcml", plone.app.discussion)
-        fiveconfigure.debug_mode = False
-        ztc.installPackage("plone.app.discussion", quiet=1)
-
-    @classmethod
-    def tearDown(cls):
-        pass