diff --git a/news/155.bugfix b/news/155.bugfix
new file mode 100644
index 0000000..2278b62
--- /dev/null
+++ b/news/155.bugfix
@@ -0,0 +1,3 @@
+- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot
+  tests.
+  [Rotonen]
diff --git a/plone/app/discussion/tests/robot/test_discussion.robot b/plone/app/discussion/tests/robot/test_discussion.robot
index a4e56e1..dc1caa2 100644
--- a/plone/app/discussion/tests/robot/test_discussion.robot
+++ b/plone/app/discussion/tests/robot/test_discussion.robot
@@ -9,12 +9,13 @@
 
 *** Settings ***
 
+Resource  plone/app/robotframework/saucelabs.robot
 Resource  plone/app/robotframework/selenium.robot
 
 Library  Remote  ${PLONE_URL}/RobotRemote
 
-Test Setup  Open test browser
-Test Teardown  Close all browsers
+Test Setup  Run Keywords  Plone test setup
+Test Teardown  Run keywords  Plone test teardown
 
 
 *** Test Cases ***
@@ -31,13 +32,13 @@ Add Comment to a Document
    When I add a comment
    Then I can see the comment below the document
 
-#Reply to a comment on a Document
-#  Given a logged-in Site Administrator
-#    and a document with discussion enabled
+Reply to a comment on a Document
+  Given a logged-in Site Administrator
+    and a document with discussion enabled
 
-#Delete Comment from a Document
-#  Given a logged-in Site Administrator
-#    and a document with discussion enabled
+Delete Comment from a Document
+  Given a logged-in Site Administrator
+    and a document with discussion enabled
 
 
 *** Keywords ***