diff --git a/tests/behat/features/toolLink.feature b/tests/behat/features/toolLink.feature
index 2604c6a0c3..71232fb78f 100644
--- a/tests/behat/features/toolLink.feature
+++ b/tests/behat/features/toolLink.feature
@@ -8,16 +8,17 @@ Feature: Link tool
 
   Scenario: Create a link category
     Given I am on "/main/link/link.php?action=addcategory&cid=1"
-    And wait for the page to be loaded
+    And wait the page to be loaded when ready
     When I fill in the following:
       | category_title | Category 1 |
-      | description    | Category description |
+    And I fill in ckeditor field "description" with "Category description"
     And I press "submitCategory"
     And wait for the page to be loaded
     Then I should see "Category added"
 
   Scenario: Create a link
     And I am on "/main/link/link.php?action=addlink&cid=1"
+    And wait the page to be loaded when ready
     When I fill in the following:
       | url   | http://www.chamilo.org |
       | title | Chamilo |
@@ -38,11 +39,13 @@ Feature: Link tool
     Given I am on "/main/link/link.php?cid=1"
     And I follow "Delete"
     And I confirm the popup
+    And wait very long for the page to be loaded
     Then I should see "The link has been deleted"
 
   Scenario: Delete link category
     Given I am on "/main/link/link.php?cid=1"
     And I follow "Delete"
+    And wait very long for the page to be loaded
     Then I should see "The category has been deleted."
 
 
diff --git a/tests/behat/features/toolWork.feature b/tests/behat/features/toolWork.feature
index 3390b29549..54cfc56343 100644
--- a/tests/behat/features/toolWork.feature
+++ b/tests/behat/features/toolWork.feature
@@ -2,16 +2,16 @@ Feature: Work tool
   In order to use the work tool
   The teachers should be able to create works
 
-#  Scenario: Create a work
-#    Given I am a platform administrator
-#    And I am on course "TEMP" homepage
-#    And I am on "/main/work/work.php?action=create_dir&cid=1"
-#    When I fill in the following:
-#      | new_dir | Work 1 |
-#    And I fill in ckeditor field "description" with "Work description"
-#    And I press "submit"
-#    And I wait for the page to be loaded
-#    Then I should see "Directory created"
+  Scenario: Create a work
+    Given I am a platform administrator
+    And I am on course "TEMP" homepage
+    And I am on "/main/work/work.php?action=create_dir&cid=1"
+    When I fill in the following:
+      | new_dir | Work 1 |
+    And I fill in ckeditor field "description" with "Work description"
+    And I press "submit"
+    And I wait for the page to be loaded
+    Then I should see "Directory created"
 
   Scenario: Edit a work
     Given I am a platform administrator