diff --git a/CHANGES.rst b/CHANGES.rst
index 26540d6..f3dcf37 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -29,6 +29,9 @@ Bug fixes:
 - Fix imports to be compatible with python 2 and 3 using six
   [rudaporto]
 
+- Switch to bbb_at.PloneTestCase.
+  [pbauer]
+
 
 3.1.3 (2016-09-07)
 ------------------
diff --git a/Products/CMFFormController/tests/testCopyRename.py b/Products/CMFFormController/tests/testCopyRename.py
index 73d1d9c..334ac67 100644
--- a/Products/CMFFormController/tests/testCopyRename.py
+++ b/Products/CMFFormController/tests/testCopyRename.py
@@ -2,7 +2,7 @@
 # Test copying/pasting of controller objects
 #
 
-from plone.app.testing.bbb import PloneTestCase
+from plone.app.testing.bbb_at import PloneTestCase
 
 from Products.CMFFormController.FormAction import FormAction
 from Products.CMFFormController.FormValidator import FormValidator