diff --git a/tests/behat/features/apply-formatting.feature b/tests/behat/features/apply-formatting.feature
index a7e7dfff..dc977cab 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 a7c16566..cec74cd1 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 486bad37..2a3884ac 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 0e85affe..64b8bbda 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 93b8184c..5af1ba2d 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 193a5614..95e53c00 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 eee84f8f..c18501fe 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 9b40c245..bfcf28bf 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 5d863446..821393c8 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 de9ea794..436cebce 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 34dfd7b8..e94fc79f 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 c019d8a3..d6ac5497 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 1192bd82..1d313015 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