diff --git a/mod/lti/tests/behat/addtype.feature b/mod/lti/tests/behat/addtype.feature
index cb229b3396e..8d2869bbec2 100644
--- a/mod/lti/tests/behat/addtype.feature
+++ b/mod/lti/tests/behat/addtype.feature
@@ -14,17 +14,12 @@ Feature: Add preconfigured tools via teacher interface
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name      | typeid | toolurl                                                  |
+      | lti      | C1     | Test tool | 0      | /mod/lti/tests/fixtures/ims_cartridge_basic_lti_link.xml |
 
-  @javascript
   Scenario: Add a tool from a cartridge
-    Given the following "activity" exists:
-      | course   | C1                 |
-      | activity | lti                |
-      | name     | Test tool activity |
-    When I am on the "Test tool activity" "lti activity editing" page logged in as teacher1
-    And I set the field "Tool URL" to local url "/mod/lti/tests/fixtures/ims_cartridge_basic_lti_link.xml"
-    And I press "Save and return to course"
-    And I am on the "Test tool activity" "lti activity editing" page
+    Given I am on the "Test tool" "lti activity editing" page logged in as teacher1
     And I expand all fieldsets
     Then the field "Tool URL" matches value "http://www.example.com/lti/provider.php"
     And the field "Secure tool URL" matches value "https://www.example.com/lti/provider.php"
@@ -33,11 +28,7 @@ Feature: Add preconfigured tools via teacher interface
 
   @javascript @_switch_window
   Scenario: Add a preconfigured tool from a cartridge
-    Given the following "activity" exists:
-      | course   | C1                   |
-      | activity | lti                  |
-      | name     | Test tool activity 1 |
-    When I am on the "Test tool activity 1" "lti activity editing" page logged in as teacher1
+    Given I am on the "Test tool" "lti activity editing" page logged in as teacher1
     And I follow "Add preconfigured tool"
     And I switch to "add_tool" window
     And I set the field "Tool name" to "Placeholder"
@@ -46,24 +37,20 @@ Feature: Add preconfigured tools via teacher interface
     And I switch to the main window
     And I wait "2" seconds
     And I follow "Edit preconfigured tool"
-    And I switch to "edit_tool" window
+    When I switch to "edit_tool" window
     Then the field "Tool URL" matches value "http://www.example.com/lti/provider.php"
     And the field "Icon URL" matches value "http://download.moodle.org/unittest/test.jpg"
     And the field "Secure icon URL" matches value "https://download.moodle.org/unittest/test.jpg"
     And I press "Cancel"
     And I switch to the main window
-    And I press "Save and return to course"
-    And I am on the "Test tool activity 1" "lti activity editing" page
+    And I press "Save and display"
+    And I am on the "Test tool" "lti activity editing" page
     And the field "Preconfigured tool" matches value "Placeholder"
 
   @javascript @_switch_window
   Scenario: Add and use a preconfigured tool
-    Given the following "activity" exists:
-      | course   | C1                 |
-      | activity | lti                |
-      | name     | Test tool activity |
-    When I am on the "Test tool activity" "lti activity editing" page logged in as teacher1
+    Given I am on the "Test tool" "lti activity editing" page logged in as teacher1
     And I set the field "Tool URL" to local url "/mod/lti/tests/fixtures/tool_provider.php"
     And I press "Save and display"
-    And I switch to "contentframe" iframe
+    When I switch to "contentframe" iframe
     Then I should see "This represents a tool provider"
diff --git a/mod/lti/tests/behat/contentitem.feature b/mod/lti/tests/behat/contentitem.feature
index 157d16f1eea..61c78a0fe53 100644
--- a/mod/lti/tests/behat/contentitem.feature
+++ b/mod/lti/tests/behat/contentitem.feature
@@ -88,11 +88,8 @@ Feature: Content-Item support
   @javascript
   Scenario: Editing a manually configured external tool
     Given the following "activities" exist:
-      | activity | course | name                 | typeid | toolurl                                   |
-      | lti      | C1     | Test tool activity 1 | 0      | /mod/lti/tests/fixtures/tool_provider.php |
-    And I am on the "Course 1" course page logged in as teacher1
-    And I turn editing mode on
-    When I open "Test tool activity 1" actions menu
-    And I choose "Edit settings" in the open action menu
+      | activity | course | name      | typeid | toolurl                                   |
+      | lti      | C1     | Test tool | 0      | /mod/lti/tests/fixtures/tool_provider.php |
+    And I am on the "Test tool" "lti activity editing" page logged in as teacher1
     Then the field "Preconfigured tool" matches value "Automatic, based on tool URL"
     And the "Select content" "button" should be disabled
diff --git a/mod/lti/tests/behat/renametool.feature b/mod/lti/tests/behat/renametool.feature
index 48eee71af4c..c7fd83f7d05 100644
--- a/mod/lti/tests/behat/renametool.feature
+++ b/mod/lti/tests/behat/renametool.feature
@@ -5,23 +5,18 @@ Feature: Rename external tools via inline editing
   I need to be able to rename the LTI tool and have it's name change in the gradebook
 
   Background:
-    Given the following "users" exist:
-      | username | firstname | lastname | email                |
-      | teacher1 | Terry1    | Teacher1 | teacher1@example.com |
-    And the following "courses" exist:
+    Given the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
-    And the following "course enrolments" exist:
-      | user | course | role |
-      | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name                 |
+      | lti      | C1     | Test tool activity 1 |
 
   @javascript
   Scenario: Add a tool and inline edit
-    When I log in as "teacher1"
+    When I log in as "admin"
     And I am on "Course 1" course homepage with editing mode on
-    And I add a "External tool" to section "1" and I fill the form with:
-      | Activity name | Test tool activity 1 |
-    And I set the field "Edit title" in the "li#section-1" "css_element" to "Test tool activity renamed"
+    And I set the field "Edit title" in the "Test tool activity 1" "activity" to "Test tool activity renamed"
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should not see "Test tool activity 1"
     And I should see "Test tool activity renamed"
diff --git a/mod/lti/tests/behat/toolconfigure.feature b/mod/lti/tests/behat/toolconfigure.feature
index 171ebee8e10..fac22921a6c 100644
--- a/mod/lti/tests/behat/toolconfigure.feature
+++ b/mod/lti/tests/behat/toolconfigure.feature
@@ -5,18 +5,7 @@ Feature: Configure tool types
   I need to be able to add, remove and configure tool types
 
   Background:
-    Given the following "users" exist:
-      | username | firstname | lastname | email                |
-      | teacher1 | Terry1    | Teacher1 | teacher1@example.com |
-      | student1 | Sam1      | Student1 | student1@example.com |
-    And the following "courses" exist:
-      | fullname | shortname | category |
-      | Course 1 | C1 | 0 |
-    And the following "course enrolments" exist:
-      | user | course | role |
-      | teacher1 | C1 | editingteacher |
-      | student1 | C1 | student |
-    And I log in as "admin"
+    Given I log in as "admin"
     And I navigate to "Plugins > Activity modules > External tool > Manage tools" in site administration
 
   @javascript
diff --git a/mod/lti/tests/generator/lib.php b/mod/lti/tests/generator/lib.php
index aedcd4b700b..59e8136bebb 100644
--- a/mod/lti/tests/generator/lib.php
+++ b/mod/lti/tests/generator/lib.php
@@ -42,6 +42,9 @@ class mod_lti_generator extends testing_module_generator {
 
         if (!isset($record->toolurl)) {
             $record->toolurl = '';
+        } else {
+            $toolurl = new moodle_url($record->toolurl);
+            $record->toolurl = $toolurl->out(false);
         }
         if (!isset($record->resourcekey)) {
             $record->resourcekey = '12345';