diff --git a/tests/behat/features/apply-formatting.feature b/tests/behat/features/apply-formatting.feature
index a7e7dfff20..dc977cab06 100644
--- a/tests/behat/features/apply-formatting.feature
+++ b/tests/behat/features/apply-formatting.feature
@@ -1,3 +1,4 @@
+@retry @job1
 Feature: Apply rich formatting to content
   As a cms author
   I want to work with content in the way I'm used to from word processing software
diff --git a/tests/behat/features/create-a-page.feature b/tests/behat/features/create-a-page.feature
index a7c165667a..cec74cd147 100644
--- a/tests/behat/features/create-a-page.feature
+++ b/tests/behat/features/create-a-page.feature
@@ -1,3 +1,4 @@
+@retry @job1
 Feature: Create a page
   As an author
   I want to create a page in the CMS
diff --git a/tests/behat/features/duplicate-a-page.feature b/tests/behat/features/duplicate-a-page.feature
index 486bad3714..2a3884ac62 100644
--- a/tests/behat/features/duplicate-a-page.feature
+++ b/tests/behat/features/duplicate-a-page.feature
@@ -1,3 +1,4 @@
+@retry @job1
 Feature: Duplicate a page
 	As an author
 	I want to duplicate a page in the CMS
diff --git a/tests/behat/features/edit-a-page.feature b/tests/behat/features/edit-a-page.feature
index d35f1df857..575153e960 100644
--- a/tests/behat/features/edit-a-page.feature
+++ b/tests/behat/features/edit-a-page.feature
@@ -1,3 +1,4 @@
+@retry @job1
 Feature: Edit a page
   As an author
   I want to edit a page in the CMS
diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature
index 1451420f12..5305ee007c 100644
--- a/tests/behat/features/insert-a-link.feature
+++ b/tests/behat/features/insert-a-link.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job1
 Feature: Insert links into a page
 As a cms author
 I want to insert a link into my content
diff --git a/tests/behat/features/insert-anchor-link.feature b/tests/behat/features/insert-anchor-link.feature
index 440d885889..de9fa1f14b 100644
--- a/tests/behat/features/insert-anchor-link.feature
+++ b/tests/behat/features/insert-anchor-link.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Insert links into a page
 As a cms author
 I want to insert a link into my content
diff --git a/tests/behat/features/manage-page-permissions.feature b/tests/behat/features/manage-page-permissions.feature
index eee84f8faf..c18501fe60 100644
--- a/tests/behat/features/manage-page-permissions.feature
+++ b/tests/behat/features/manage-page-permissions.feature
@@ -1,3 +1,4 @@
+@retry @job2
 Feature: Manage page permissions
   As an administrator
   I want to manage view and edit permissions on pages
diff --git a/tests/behat/features/preview-a-page.feature b/tests/behat/features/preview-a-page.feature
index 9b40c24527..bfcf28bf5a 100644
--- a/tests/behat/features/preview-a-page.feature
+++ b/tests/behat/features/preview-a-page.feature
@@ -1,3 +1,4 @@
+@retry @job2
 Feature: Preview a page
   As an author
   I want to preview the page I'm editing in the CMS
diff --git a/tests/behat/features/publish-a-page.feature b/tests/behat/features/publish-a-page.feature
index 5d863446a4..821393c89f 100644
--- a/tests/behat/features/publish-a-page.feature
+++ b/tests/behat/features/publish-a-page.feature
@@ -1,3 +1,4 @@
+@retry @job2
 Feature: Publish a page
   As a site owner
   I want content to go to a draft site before being published
diff --git a/tests/behat/features/redirector-page.feature b/tests/behat/features/redirector-page.feature
index de9ea79427..436cebce35 100644
--- a/tests/behat/features/redirector-page.feature
+++ b/tests/behat/features/redirector-page.feature
@@ -1,3 +1,4 @@
+@retry @job3
 Feature: Redirector Pages
   As an author
   I want to redirect to a different location
diff --git a/tests/behat/features/search-for-a-page.feature b/tests/behat/features/search-for-a-page.feature
index 34dfd7b811..e94fc79f1e 100644
--- a/tests/behat/features/search-for-a-page.feature
+++ b/tests/behat/features/search-for-a-page.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Search for a page
   As an author
   I want to search for a page in the CMS
diff --git a/tests/behat/features/sitetree.feature b/tests/behat/features/sitetree.feature
index c019d8a308..d6ac54971b 100644
--- a/tests/behat/features/sitetree.feature
+++ b/tests/behat/features/sitetree.feature
@@ -1,3 +1,4 @@
+@retry @job3
 Feature: Sitetree
   As an author
   I want to operate the sitetree
diff --git a/tests/behat/features/view-reports.feature b/tests/behat/features/view-reports.feature
index 1192bd82c5..1d313015a8 100644
--- a/tests/behat/features/view-reports.feature
+++ b/tests/behat/features/view-reports.feature
@@ -1,3 +1,4 @@
+@retry @job3
 Feature: View Reports
   As an author
   I want to review aggregate reports on pages