diff --git a/test/javascripts/admin/controllers/admin_badges_controller_test.js b/test/javascripts/admin/controllers/admin-badges-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin_badges_controller_test.js
rename to test/javascripts/admin/controllers/admin-badges-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin_email_index_controller_test.js b/test/javascripts/admin/controllers/admin-email-index-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin_email_index_controller_test.js
rename to test/javascripts/admin/controllers/admin-email-index-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin_email_preview_digest_controller_test.js b/test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin_email_preview_digest_controller_test.js
rename to test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin_site_settings_controller_test.js b/test/javascripts/admin/controllers/admin-site-settings-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin_site_settings_controller_test.js
rename to test/javascripts/admin/controllers/admin-site-settings-test.js.es6
diff --git a/test/javascripts/admin/models/admin_user_test.js b/test/javascripts/admin/models/admin-user-test.js.es6
similarity index 100%
rename from test/javascripts/admin/models/admin_user_test.js
rename to test/javascripts/admin/models/admin-user-test.js.es6
diff --git a/test/javascripts/admin/models/api_key_test.js b/test/javascripts/admin/models/api-key-test.js.es6
similarity index 100%
rename from test/javascripts/admin/models/api_key_test.js
rename to test/javascripts/admin/models/api-key-test.js.es6
diff --git a/test/javascripts/admin/models/flagged_post_test.js b/test/javascripts/admin/models/flagged-post-test.js.es6
similarity index 100%
rename from test/javascripts/admin/models/flagged_post_test.js
rename to test/javascripts/admin/models/flagged-post-test.js.es6
diff --git a/test/javascripts/components/home_logo_component_test.js b/test/javascripts/components/home-logo-test.js.es6
similarity index 100%
rename from test/javascripts/components/home_logo_component_test.js
rename to test/javascripts/components/home-logo-test.js.es6
diff --git a/test/javascripts/components/keyboard_shortcuts_component_test.js b/test/javascripts/components/keyboard-shortcuts-test.js.es6
similarity index 100%
rename from test/javascripts/components/keyboard_shortcuts_component_test.js
rename to test/javascripts/components/keyboard-shortcuts-test.js.es6
diff --git a/test/javascripts/ember/resolver_test.js b/test/javascripts/ember/resolver-test.js.es6
similarity index 100%
rename from test/javascripts/ember/resolver_test.js
rename to test/javascripts/ember/resolver-test.js.es6
diff --git a/test/javascripts/lib/bbcode_test.js b/test/javascripts/lib/bbcode-test.js.es6
similarity index 100%
rename from test/javascripts/lib/bbcode_test.js
rename to test/javascripts/lib/bbcode-test.js.es6
diff --git a/test/javascripts/lib/click_track_test.js b/test/javascripts/lib/click-track-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click_track_test.js
rename to test/javascripts/lib/click-track-test.js.es6
diff --git a/test/javascripts/lib/computed_test.js b/test/javascripts/lib/computed-test.js.es6
similarity index 100%
rename from test/javascripts/lib/computed_test.js
rename to test/javascripts/lib/computed-test.js.es6
diff --git a/test/javascripts/lib/debounce_promise_test.js b/test/javascripts/lib/debounce-promise-test.js.es6
similarity index 100%
rename from test/javascripts/lib/debounce_promise_test.js
rename to test/javascripts/lib/debounce-promise-test.js.es6
diff --git a/test/javascripts/lib/debounce_test.js b/test/javascripts/lib/debounce-test.js.es6
similarity index 100%
rename from test/javascripts/lib/debounce_test.js
rename to test/javascripts/lib/debounce-test.js.es6
diff --git a/test/javascripts/lib/formatter_test.js b/test/javascripts/lib/formatter-test.js.es6
similarity index 100%
rename from test/javascripts/lib/formatter_test.js
rename to test/javascripts/lib/formatter-test.js.es6
diff --git a/test/javascripts/lib/html_test.js b/test/javascripts/lib/html-test.js.es6
similarity index 100%
rename from test/javascripts/lib/html_test.js
rename to test/javascripts/lib/html-test.js.es6
diff --git a/test/javascripts/lib/key_value_store_test.js b/test/javascripts/lib/key-value-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/key_value_store_test.js
rename to test/javascripts/lib/key-value-store-test.js.es6
diff --git a/test/javascripts/lib/markdown_test.js b/test/javascripts/lib/markdown-test.js.es6
similarity index 100%
rename from test/javascripts/lib/markdown_test.js
rename to test/javascripts/lib/markdown-test.js.es6
diff --git a/test/javascripts/lib/onebox_test.js b/test/javascripts/lib/onebox-test.js.es6
similarity index 100%
rename from test/javascripts/lib/onebox_test.js
rename to test/javascripts/lib/onebox-test.js.es6
diff --git a/test/javascripts/lib/preload_store_test.js b/test/javascripts/lib/preload-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/preload_store_test.js
rename to test/javascripts/lib/preload-store-test.js.es6
diff --git a/test/javascripts/lib/url_test.js b/test/javascripts/lib/url-test.js.es6
similarity index 100%
rename from test/javascripts/lib/url_test.js
rename to test/javascripts/lib/url-test.js.es6
diff --git a/test/javascripts/lib/utilities_test.js b/test/javascripts/lib/utilities-test.js.es6
similarity index 100%
rename from test/javascripts/lib/utilities_test.js
rename to test/javascripts/lib/utilities-test.js.es6
diff --git a/test/javascripts/mixins/has_current_user_test.js b/test/javascripts/mixins/has-current-user-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/has_current_user_test.js
rename to test/javascripts/mixins/has-current-user-test.js.es6
diff --git a/test/javascripts/mixins/presence_test.js b/test/javascripts/mixins/presence-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/presence_test.js
rename to test/javascripts/mixins/presence-test.js.es6
diff --git a/test/javascripts/mixins/selected_posts_count_test.js b/test/javascripts/mixins/selected-posts-count-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/selected_posts_count_test.js
rename to test/javascripts/mixins/selected-posts-count-test.js.es6
diff --git a/test/javascripts/mixins/singleton_test.js b/test/javascripts/mixins/singleton-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/singleton_test.js
rename to test/javascripts/mixins/singleton-test.js.es6
diff --git a/test/javascripts/models/badge_test.js b/test/javascripts/models/badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/badge_test.js
rename to test/javascripts/models/badge-test.js.es6
diff --git a/test/javascripts/models/category_test.js b/test/javascripts/models/category-test.js.es6
similarity index 100%
rename from test/javascripts/models/category_test.js
rename to test/javascripts/models/category-test.js.es6
diff --git a/test/javascripts/models/composer_test.js b/test/javascripts/models/composer-test.js.es6
similarity index 100%
rename from test/javascripts/models/composer_test.js
rename to test/javascripts/models/composer-test.js.es6
diff --git a/test/javascripts/models/email_log_test.js b/test/javascripts/models/email-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/email_log_test.js
rename to test/javascripts/models/email-log-test.js.es6
diff --git a/test/javascripts/models/invite_test.js b/test/javascripts/models/invite-test.js.es6
similarity index 100%
rename from test/javascripts/models/invite_test.js
rename to test/javascripts/models/invite-test.js.es6
diff --git a/test/javascripts/models/model_test.js b/test/javascripts/models/model-test.js.es6
similarity index 100%
rename from test/javascripts/models/model_test.js
rename to test/javascripts/models/model-test.js.es6
diff --git a/test/javascripts/models/nav_item_test.js b/test/javascripts/models/nav-item-test.js.es6
similarity index 100%
rename from test/javascripts/models/nav_item_test.js
rename to test/javascripts/models/nav-item-test.js.es6
diff --git a/test/javascripts/models/post_stream_test.js b/test/javascripts/models/post-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/post_stream_test.js
rename to test/javascripts/models/post-stream-test.js.es6
diff --git a/test/javascripts/models/post_test.js b/test/javascripts/models/post-test.js.es6
similarity index 100%
rename from test/javascripts/models/post_test.js
rename to test/javascripts/models/post-test.js.es6
diff --git a/test/javascripts/models/report_test.js b/test/javascripts/models/report-test.js.es6
similarity index 100%
rename from test/javascripts/models/report_test.js
rename to test/javascripts/models/report-test.js.es6
diff --git a/test/javascripts/models/session_test.js b/test/javascripts/models/session-test.js.es6
similarity index 100%
rename from test/javascripts/models/session_test.js
rename to test/javascripts/models/session-test.js.es6
diff --git a/test/javascripts/models/site_test.js b/test/javascripts/models/site-test.js.es6
similarity index 100%
rename from test/javascripts/models/site_test.js
rename to test/javascripts/models/site-test.js.es6
diff --git a/test/javascripts/models/staff_action_log_test.js b/test/javascripts/models/staff-action-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/staff_action_log_test.js
rename to test/javascripts/models/staff-action-log-test.js.es6
diff --git a/test/javascripts/models/topic_details_test.js b/test/javascripts/models/topic-details-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic_details_test.js
rename to test/javascripts/models/topic-details-test.js.es6
diff --git a/test/javascripts/models/topic_test.js b/test/javascripts/models/topic-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic_test.js
rename to test/javascripts/models/topic-test.js.es6
diff --git a/test/javascripts/models/topic_tracking_state_test.js b/test/javascripts/models/topic-tracking-state-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic_tracking_state_test.js
rename to test/javascripts/models/topic-tracking-state-test.js.es6
diff --git a/test/javascripts/models/user_action_test.js b/test/javascripts/models/user-action-test.js.es6
similarity index 100%
rename from test/javascripts/models/user_action_test.js
rename to test/javascripts/models/user-action-test.js.es6
diff --git a/test/javascripts/models/user_badge_test.js b/test/javascripts/models/user-badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/user_badge_test.js
rename to test/javascripts/models/user-badge-test.js.es6
diff --git a/test/javascripts/models/user_stream_test.js b/test/javascripts/models/user-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/user_stream_test.js
rename to test/javascripts/models/user-stream-test.js.es6
diff --git a/test/javascripts/models/user_test.js b/test/javascripts/models/user-test.js.es6
similarity index 100%
rename from test/javascripts/models/user_test.js
rename to test/javascripts/models/user-test.js.es6
diff --git a/test/javascripts/models/version_check_test.js b/test/javascripts/models/version-check-test.js.es6
similarity index 100%
rename from test/javascripts/models/version_check_test.js
rename to test/javascripts/models/version-check-test.js.es6
diff --git a/test/javascripts/views/container_view_test.js b/test/javascripts/views/container-view-test.js.es6
similarity index 100%
rename from test/javascripts/views/container_view_test.js
rename to test/javascripts/views/container-view-test.js.es6
diff --git a/test/javascripts/views/header_view_test.js b/test/javascripts/views/header-view-test.js.es6
similarity index 100%
rename from test/javascripts/views/header_view_test.js
rename to test/javascripts/views/header-view-test.js.es6
diff --git a/test/javascripts/views/text_field_test.js b/test/javascripts/views/text-field-test.js.es6
similarity index 100%
rename from test/javascripts/views/text_field_test.js
rename to test/javascripts/views/text-field-test.js.es6
diff --git a/test/javascripts/views/view_test.js b/test/javascripts/views/view-test.js.es6
similarity index 100%
rename from test/javascripts/views/view_test.js
rename to test/javascripts/views/view-test.js.es6