diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature
index 29dcbbbfc512..a8bb417ad6d0 100644
--- a/cms/djangoapps/contentstore/features/html-editor.feature
+++ b/cms/djangoapps/contentstore/features/html-editor.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_2
 Feature: CMS.HTML Editor
   As a course author, I want to be able to create HTML blocks.
 
diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature
index eb66b8ffd92a..edcb1b93e2d2 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.feature
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_1
 Feature: CMS.Problem Editor
   As a course author, I want to be able to create problems and edit their settings.
 
diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature
index d8912c3f6101..16cd5502952f 100644
--- a/cms/djangoapps/contentstore/features/signup.feature
+++ b/cms/djangoapps/contentstore/features/signup.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_2
 Feature: CMS.Sign in
   In order to use the edX content
   As a new user
diff --git a/cms/djangoapps/contentstore/features/static-pages.feature b/cms/djangoapps/contentstore/features/static-pages.feature
index 39399fb20725..c27cad74d1f2 100644
--- a/cms/djangoapps/contentstore/features/static-pages.feature
+++ b/cms/djangoapps/contentstore/features/static-pages.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_2
 Feature: CMS.Static Pages
     As a course author, I want to be able to add static pages
 
diff --git a/cms/djangoapps/contentstore/features/textbooks.feature b/cms/djangoapps/contentstore/features/textbooks.feature
index 010e4902569c..85c9ee12a7fb 100644
--- a/cms/djangoapps/contentstore/features/textbooks.feature
+++ b/cms/djangoapps/contentstore/features/textbooks.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_2
 Feature: CMS.Textbooks
 
   Scenario: No textbooks
diff --git a/cms/djangoapps/contentstore/features/transcripts.feature b/cms/djangoapps/contentstore/features/transcripts.feature
index 9ca8f349ab8c..1d003bddbc3d 100644
--- a/cms/djangoapps/contentstore/features/transcripts.feature
+++ b/cms/djangoapps/contentstore/features/transcripts.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Video Component Editor
+Feature: CMS.Transcripts
   As a course author, I want to be able to create video components.
 
     # For transcripts acceptance tests there are 3 available caption
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index 2e73c11c0c3f..9c538bad1eae 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -1,4 +1,4 @@
-@shard_3
+@shard_2
 Feature: CMS.Upload Files
     As a course author, I want to be able to upload files for my students