diff --git a/tests/static/accordion.html b/tests/static/accordion/accordion.html
similarity index 83%
rename from tests/static/accordion.html
rename to tests/static/accordion/accordion.html
index c9c433e20..3ffea69e4 100644
--- a/tests/static/accordion.html
+++ b/tests/static/accordion/accordion.html
@@ -2,11 +2,10 @@
jQuery UI Accordion Static Markup Test Page
-
-
-
-
-
+
+
+
+
diff --git a/tests/static/all.html b/tests/static/all.html
index fffbf9de1..3e7c65af4 100644
--- a/tests/static/all.html
+++ b/tests/static/all.html
@@ -2,9 +2,8 @@
jQuery UI Static Markup Test Page
-
+
-
diff --git a/tests/static/tabs.html b/tests/static/tabs/tabs.html
similarity index 80%
rename from tests/static/tabs.html
rename to tests/static/tabs/tabs.html
index 03c5bde34..576c7be6b 100644
--- a/tests/static/tabs.html
+++ b/tests/static/tabs/tabs.html
@@ -2,11 +2,10 @@
jQuery UI Tabs Static Markup Test Page
-
-
-
-
-
+
+
+
+
diff --git a/tests/visual/accordion.html b/tests/visual/accordion/accordion.html
similarity index 71%
rename from tests/visual/accordion.html
rename to tests/visual/accordion/accordion.html
index 3907104b1..fd467dc27 100644
--- a/tests/visual/accordion.html
+++ b/tests/visual/accordion/accordion.html
@@ -2,11 +2,11 @@
jQuery UI Accordion Visual Test
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/visual/draggable.handle.html b/tests/visual/draggable/draggable.handle.html
similarity index 50%
rename from tests/visual/draggable.handle.html
rename to tests/visual/draggable/draggable.handle.html
index 41ce2ae9d..1ff9b39fc 100644
--- a/tests/visual/draggable.handle.html
+++ b/tests/visual/draggable/draggable.handle.html
@@ -2,11 +2,11 @@
Simple Draggable with Handle
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/visual/draggable.scroll.html b/tests/visual/draggable/draggable.scroll.html
similarity index 89%
rename from tests/visual/draggable.scroll.html
rename to tests/visual/draggable/draggable.scroll.html
index 055e96e05..e79f19338 100644
--- a/tests/visual/draggable.scroll.html
+++ b/tests/visual/draggable/draggable.scroll.html
@@ -2,12 +2,12 @@
Draggable Scroll Tests
-
-
-
-
-
-
+
+
+
+
+
+