diff --git a/test/firebug-lite/ChangeLog b/tests/firebug-lite/ChangeLog
similarity index 100%
rename from test/firebug-lite/ChangeLog
rename to tests/firebug-lite/ChangeLog
diff --git a/test/firebug-lite/errorIcon.png b/tests/firebug-lite/errorIcon.png
similarity index 100%
rename from test/firebug-lite/errorIcon.png
rename to tests/firebug-lite/errorIcon.png
diff --git a/test/firebug-lite/firebug-lite-compressed.js b/tests/firebug-lite/firebug-lite-compressed.js
similarity index 100%
rename from test/firebug-lite/firebug-lite-compressed.js
rename to tests/firebug-lite/firebug-lite-compressed.js
diff --git a/test/firebug-lite/firebug-lite.css b/tests/firebug-lite/firebug-lite.css
similarity index 100%
rename from test/firebug-lite/firebug-lite.css
rename to tests/firebug-lite/firebug-lite.css
diff --git a/test/firebug-lite/firebug-lite.js b/tests/firebug-lite/firebug-lite.js
similarity index 100%
rename from test/firebug-lite/firebug-lite.js
rename to tests/firebug-lite/firebug-lite.js
diff --git a/test/firebug-lite/firebug.gif b/tests/firebug-lite/firebug.gif
similarity index 100%
rename from test/firebug-lite/firebug.gif
rename to tests/firebug-lite/firebug.gif
diff --git a/test/firebug-lite/firebug_logo.png b/tests/firebug-lite/firebug_logo.png
similarity index 100%
rename from test/firebug-lite/firebug_logo.png
rename to tests/firebug-lite/firebug_logo.png
diff --git a/test/firebug-lite/infoIcon.png b/tests/firebug-lite/infoIcon.png
similarity index 100%
rename from test/firebug-lite/infoIcon.png
rename to tests/firebug-lite/infoIcon.png
diff --git a/test/firebug-lite/progress.gif b/tests/firebug-lite/progress.gif
similarity index 100%
rename from test/firebug-lite/progress.gif
rename to tests/firebug-lite/progress.gif
diff --git a/test/firebug-lite/spacer.gif b/tests/firebug-lite/spacer.gif
similarity index 100%
rename from test/firebug-lite/spacer.gif
rename to tests/firebug-lite/spacer.gif
diff --git a/test/firebug-lite/tree_close.gif b/tests/firebug-lite/tree_close.gif
similarity index 100%
rename from test/firebug-lite/tree_close.gif
rename to tests/firebug-lite/tree_close.gif
diff --git a/test/firebug-lite/tree_open.gif b/tests/firebug-lite/tree_open.gif
similarity index 100%
rename from test/firebug-lite/tree_open.gif
rename to tests/firebug-lite/tree_open.gif
diff --git a/test/firebug-lite/warningIcon.png b/tests/firebug-lite/warningIcon.png
similarity index 100%
rename from test/firebug-lite/warningIcon.png
rename to tests/firebug-lite/warningIcon.png
diff --git a/test/gcal.html b/tests/gcal.html
similarity index 100%
rename from test/gcal.html
rename to tests/gcal.html
diff --git a/test/jquery-legacy/jquery.js b/tests/jquery-legacy/jquery.js
similarity index 100%
rename from test/jquery-legacy/jquery.js
rename to tests/jquery-legacy/jquery.js
diff --git a/test/jquery-legacy/ui.core.js b/tests/jquery-legacy/ui.core.js
similarity index 100%
rename from test/jquery-legacy/ui.core.js
rename to tests/jquery-legacy/ui.core.js
diff --git a/test/jquery-legacy/ui.draggable.js b/tests/jquery-legacy/ui.draggable.js
similarity index 100%
rename from test/jquery-legacy/ui.draggable.js
rename to tests/jquery-legacy/ui.draggable.js
diff --git a/test/loader.js b/tests/loader.js
similarity index 91%
rename from test/loader.js
rename to tests/loader.js
index d193efe..f7e0353 100755
--- a/test/loader.js
+++ b/tests/loader.js
@@ -50,10 +50,10 @@ if (_build) {
 }
 
 if (_legacy) {
-	includeJS('legacy-jquery/jquery.js');
-	includeJS('legacy-jquery/ui.core.js');
-	includeJS('legacy-jquery/ui.draggable.js');
-	includeJS('legacy-jquery/ui.resizable.js');
+	includeJS('jquery-legacy/jquery.js');
+	includeJS('jquery-legacy/ui.core.js');
+	includeJS('jquery-legacy/ui.draggable.js');
+	includeJS('jquery-legacy/ui.resizable.js');
 }
 else if (_build) {
 	includeJS('../build/fullcalendar/jquery/jquery.js');
diff --git a/test/locale.html b/tests/locale.html
similarity index 100%
rename from test/locale.html
rename to tests/locale.html
diff --git a/test/methods.html b/tests/methods.html
similarity index 100%
rename from test/methods.html
rename to tests/methods.html
diff --git a/test/options.html b/tests/options.html
similarity index 100%
rename from test/options.html
rename to tests/options.html
diff --git a/test/sources.html b/tests/sources.html
similarity index 100%
rename from test/sources.html
rename to tests/sources.html
diff --git a/test/theming.html b/tests/theming.html
similarity index 100%
rename from test/theming.html
rename to tests/theming.html
diff --git a/test/triggers.html b/tests/triggers.html
similarity index 100%
rename from test/triggers.html
rename to tests/triggers.html