diff --git a/IPython/html/tests/casperjs/test_cases/kernel_test.js b/IPython/html/tests/casperjs/test_cases/kernel.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/kernel_test.js
rename to IPython/html/tests/casperjs/test_cases/kernel.js
diff --git a/IPython/html/tests/casperjs/test_cases/misc_tests.js b/IPython/html/tests/casperjs/test_cases/misc.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/misc_tests.js
rename to IPython/html/tests/casperjs/test_cases/misc.js
diff --git a/IPython/html/tests/casperjs/test_cases/display_image.js b/IPython/html/tests/casperjs/test_cases/notebook/display_image.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/display_image.js
rename to IPython/html/tests/casperjs/test_cases/notebook/display_image.js
diff --git a/IPython/html/tests/casperjs/test_cases/empty_nb_arrow_keys.js b/IPython/html/tests/casperjs/test_cases/notebook/empty_arrow_keys.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/empty_nb_arrow_keys.js
rename to IPython/html/tests/casperjs/test_cases/notebook/empty_arrow_keys.js
diff --git a/IPython/html/tests/casperjs/test_cases/execute_code_cell.js b/IPython/html/tests/casperjs/test_cases/notebook/execute_code.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/execute_code_cell.js
rename to IPython/html/tests/casperjs/test_cases/notebook/execute_code.js
diff --git a/IPython/html/tests/casperjs/test_cases/inject_js.js b/IPython/html/tests/casperjs/test_cases/notebook/inject_js.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/inject_js.js
rename to IPython/html/tests/casperjs/test_cases/notebook/inject_js.js
diff --git a/IPython/html/tests/casperjs/test_cases/check_interrupt.js b/IPython/html/tests/casperjs/test_cases/notebook/interrupt.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/check_interrupt.js
rename to IPython/html/tests/casperjs/test_cases/notebook/interrupt.js
diff --git a/IPython/html/tests/casperjs/test_cases/isolated_svg.js b/IPython/html/tests/casperjs/test_cases/notebook/isolated_svg.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/isolated_svg.js
rename to IPython/html/tests/casperjs/test_cases/notebook/isolated_svg.js
diff --git a/IPython/html/tests/casperjs/test_cases/render_markdown.js b/IPython/html/tests/casperjs/test_cases/notebook/markdown.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/render_markdown.js
rename to IPython/html/tests/casperjs/test_cases/notebook/markdown.js
diff --git a/IPython/html/tests/casperjs/test_cases/merge_cells.js b/IPython/html/tests/casperjs/test_cases/notebook/merge_cells.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/merge_cells.js
rename to IPython/html/tests/casperjs/test_cases/notebook/merge_cells.js
diff --git a/IPython/html/tests/casperjs/test_cases/nb_roundtrip.js b/IPython/html/tests/casperjs/test_cases/notebook/roundtrip.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/nb_roundtrip.js
rename to IPython/html/tests/casperjs/test_cases/notebook/roundtrip.js
diff --git a/IPython/html/tests/casperjs/test_cases/safe_append_output.js b/IPython/html/tests/casperjs/test_cases/notebook/safe_append_output.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/safe_append_output.js
rename to IPython/html/tests/casperjs/test_cases/notebook/safe_append_output.js
diff --git a/IPython/html/tests/casperjs/test_cases/save_notebook.js b/IPython/html/tests/casperjs/test_cases/notebook/save.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/save_notebook.js
rename to IPython/html/tests/casperjs/test_cases/notebook/save.js
diff --git a/IPython/html/tests/casperjs/test_cases/shutdown_notebook.js b/IPython/html/tests/casperjs/test_cases/notebook/shutdown.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/shutdown_notebook.js
rename to IPython/html/tests/casperjs/test_cases/notebook/shutdown.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets.js b/IPython/html/tests/casperjs/test_cases/widgets/widget.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_bool.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_bool.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_bool.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_bool.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_button.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_button.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_button.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_button.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_container.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_container.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_container.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_container.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_float.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_float.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_float.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_float.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_image.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_image.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_image.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_image.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_int.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_int.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_int.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_int.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_multicontainer.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_multicontainer.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_multicontainer.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_multicontainer.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_selection.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_selection.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_selection.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_selection.js
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_string.js b/IPython/html/tests/casperjs/test_cases/widgets/widget_string.js
similarity index 100%
rename from IPython/html/tests/casperjs/test_cases/widgets_string.js
rename to IPython/html/tests/casperjs/test_cases/widgets/widget_string.js