diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 93a2b6ece77..4e662a3a13c 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -202,10 +202,6 @@ _TEST_FILES = \
 		test_bug558788-1.html \
 		test_bug558788-2.html \
 		test_bug561634.html \
-		test_bug588683-1.html \
-		test_bug588683-2.html \
-		test_bug588683-3.html \
-		test_bug588683-4.html \
 		test_bug590353-1.html \
 		test_bug590353-2.html \
 		test_bug593689.html \
@@ -256,7 +252,6 @@ _TEST_FILES = \
 		test_bug641219.html \
 		test_bug643051.html \
 		test_bug583514.html \
-		test_bug514437.html \
 		test_bug560112.html \
 		test_bug586786.html \
 		test_bug646157.html \
diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
index d722d5d95cf..ad197d483a5 100644
--- a/content/html/content/test/forms/Makefile.in
+++ b/content/html/content/test/forms/Makefile.in
@@ -65,6 +65,11 @@ _TEST_FILES = \
 		test_datalist_element.html \
 		test_form_attributes_reflection.html \
 		test_option_index_attribute.html \
+		test_progress_element.html \
+		test_form_attribute-1.html \
+		test_form_attribute-2.html \
+		test_form_attribute-3.html \
+		test_form_attribute-4.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug588683-1.html b/content/html/content/test/forms/test_form_attribute-1.html
similarity index 99%
rename from content/html/content/test/test_bug588683-1.html
rename to content/html/content/test/forms/test_form_attribute-1.html
index bff2be809a5..d04d5cc7084 100644
--- a/content/html/content/test/test_bug588683-1.html
+++ b/content/html/content/test/forms/test_form_attribute-1.html
@@ -4,7 +4,7 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 -->
 <head>
-  <title>Test for Bug 588683</title>
+  <title>Test for form attributes 1</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
@@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for Bug 588683 **/
+/** Test for form attributes 1 **/
 
 /**
  * All functions take an array of forms in first argument and an array of
diff --git a/content/html/content/test/test_bug588683-2.html b/content/html/content/test/forms/test_form_attribute-2.html
similarity index 97%
rename from content/html/content/test/test_bug588683-2.html
rename to content/html/content/test/forms/test_form_attribute-2.html
index 62c73c5617e..96c706b3ae0 100644
--- a/content/html/content/test/test_bug588683-2.html
+++ b/content/html/content/test/forms/test_form_attribute-2.html
@@ -4,7 +4,7 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 -->
 <head>
-  <title>Test for Bug 588683</title>
+  <title>Test for form attributes 2</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
diff --git a/content/html/content/test/test_bug588683-3.html b/content/html/content/test/forms/test_form_attribute-3.html
similarity index 96%
rename from content/html/content/test/test_bug588683-3.html
rename to content/html/content/test/forms/test_form_attribute-3.html
index 65e4e29c918..a8d4fabef54 100644
--- a/content/html/content/test/test_bug588683-3.html
+++ b/content/html/content/test/forms/test_form_attribute-3.html
@@ -4,7 +4,7 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 -->
 <head>
-  <title>Test for Bug 588683</title>
+  <title>Test for form attributes 3</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
@@ -56,7 +56,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for Bug 588683 **/
+/** Test for form attributes 3 **/
 
 SimpleTest.waitForExplicitFinish();
 
diff --git a/content/html/content/test/test_bug588683-4.html b/content/html/content/test/forms/test_form_attribute-4.html
similarity index 94%
rename from content/html/content/test/test_bug588683-4.html
rename to content/html/content/test/forms/test_form_attribute-4.html
index c66e5ece337..67484f72ec9 100644
--- a/content/html/content/test/test_bug588683-4.html
+++ b/content/html/content/test/forms/test_form_attribute-4.html
@@ -4,7 +4,7 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 -->
 <head>
-  <title>Test for Bug 588683</title>
+  <title>Test for form attributes 4</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=588683
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for Bug 588683 **/
+/** Test for form attributes 4 **/
 
 var table = document.getElementById('t');
 var i1 = document.getElementById('i1');
diff --git a/content/html/content/test/test_bug514437.html b/content/html/content/test/forms/test_progress_element.html
similarity index 98%
rename from content/html/content/test/test_bug514437.html
rename to content/html/content/test/forms/test_progress_element.html
index c9021a1dec8..1ca0097dc16 100644
--- a/content/html/content/test/test_bug514437.html
+++ b/content/html/content/test/forms/test_progress_element.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=514437
 https://bugzilla.mozilla.org/show_bug.cgi?id=633913
 -->
 <head>
-  <title>Test for Bug 514437 and Bug 633913</title>
+  <title>Test for progress element content and layout</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
@@ -23,7 +23,7 @@ and
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for Bug 514437 and Bug 633913 **/
+/** Test for progress element content and layout **/
 
 function checkFormIDLAttribute(aElement)
 {
@@ -248,7 +248,7 @@ function checkNotResetableAndFormSubmission(aElement)
      * element value should not appear.
      */
     is(frames['submit_frame'].location.href,
-      'http://mochi.test:8888/tests/content/html/content/test/foo?a=tulip',
+      'http://mochi.test:8888/tests/content/html/content/test/forms/foo?a=tulip',
        "The progress element value should not be submitted");
 
     checkNotResetable();
