diff --git a/cms/static/js/spec/views/pages/container_subviews_spec.js b/cms/static/js/spec/views/pages/container_subviews_spec.js
index 8789473ec6..b7f427787d 100644
--- a/cms/static/js/spec/views/pages/container_subviews_spec.js
+++ b/cms/static/js/spec/views/pages/container_subviews_spec.js
@@ -62,8 +62,8 @@ define(["jquery", "underscore", "underscore.string", "js/spec_helpers/create_sin
             };
 
             describe("PreviewActionController", function () {
-                var viewPublishedCss = '.view-button',
-                    previewCss = '.preview-button';
+                var viewPublishedCss = '.button-view',
+                    previewCss = '.button-preview';
 
                 it('renders correctly for private unit', function () {
                     renderContainerPage(mockContainerXBlockHtml, this);
diff --git a/cms/static/js/views/pages/container_subviews.js b/cms/static/js/views/pages/container_subviews.js
index da61925849..2ae82ccaaa 100644
--- a/cms/static/js/views/pages/container_subviews.js
+++ b/cms/static/js/views/pages/container_subviews.js
@@ -32,8 +32,8 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
         var PreviewActionController = UnitStateListenerView.extend({
 
             render: function() {
-                var previewAction = this.$el.find('.preview-button'),
-                    viewLiveAction = this.$el.find('.view-button');
+                var previewAction = this.$el.find('.button-preview'),
+                    viewLiveAction = this.$el.find('.button-view');
                 if (this.model.get('published')) {
                     viewLiveAction.removeClass(disabledCss);
                 }
diff --git a/cms/templates/js/mock/mock-container-page.underscore b/cms/templates/js/mock/mock-container-page.underscore
index cdebb424ea..b7d199178e 100644
--- a/cms/templates/js/mock/mock-container-page.underscore
+++ b/cms/templates/js/mock/mock-container-page.underscore
@@ -16,12 +16,12 @@
                 <ul>
                     % if is_unit_page:
                         <li class="action-item action-view nav-item">
-                            <a href="${published_preview_link}" class="button view-button action-button is-disabled">
+                            <a href="${published_preview_link}" class="button button-view action-button is-disabled">
                                 <span class="action-button-text">${_("View Published Version")}</span>
                             </a>
                         </li>
                         <li class="action-item action-preview nav-item">
-                            <a href="${draft_preview_link}" class="button preview-button action-button is-disabled">
+                            <a href="${draft_preview_link}" class="button button-preview action-button is-disabled">
                                 <span class="action-button-text">${_("Preview Changes")}</span>
                             </a>
                         </li>
diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index 4a89a870c2..fc9ff3628f 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -102,7 +102,7 @@ class ContainerPage(PageObject):
 
         Switches the browser to the newly opened LMS window.
         """
-        self.q(css='.view-button').first.click()
+        self.q(css='.button-view').first.click()
         self._switch_to_lms()
 
     def preview(self):
@@ -111,7 +111,7 @@ class ContainerPage(PageObject):
 
         Switches the browser to the newly opened LMS window.
         """
-        self.q(css='.preview-button').first.click()
+        self.q(css='.button-preview').first.click()
         self._switch_to_lms()
 
     def _switch_to_lms(self):