diff --git a/encoding/form/form_test.go b/encoding/form/form_test.go
index abcef80f2ad..a81c515151e 100644
--- a/encoding/form/form_test.go
+++ b/encoding/form/form_test.go
@@ -27,6 +27,58 @@ func init() {
 	}
 }
 
+func TestFormEncoderAndDecoder(t *testing.T) {
+	t.Cleanup(func() {
+		encoder.SetTagName(tagName)
+		decoder.SetTagName(tagName)
+	})
+
+	encoder.SetTagName(tagNameTest)
+	decoder.SetTagName(tagNameTest)
+
+	type testFormTagName struct {
+		Name string `form:"name_form" json:"name_json"`
+	}
+	v, err := encoder.Encode(&testFormTagName{
+		Name: "test tag name",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	jsonName := v.Get("name_json")
+	formName := v.Get("name_form")
+	switch tagNameTest {
+	case "json":
+		if jsonName != "test tag name" {
+			t.Errorf("got: %s", jsonName)
+		}
+		if formName != "" {
+			t.Errorf("want: empty, got: %s", formName)
+		}
+	case "form":
+		if formName != "test tag name" {
+			t.Errorf("got: %s", formName)
+		}
+		if jsonName != "" {
+			t.Errorf("want: empty, got: %s", jsonName)
+		}
+	default:
+		t.Fatalf("unknown tag name: %s", tagNameTest)
+	}
+
+	var tn *testFormTagName
+	err = decoder.Decode(&tn, v)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if tn == nil {
+		t.Fatal("nil tag name")
+	}
+	if tn.Name != "test tag name" {
+		t.Errorf("got %s", tn.Name)
+	}
+}
+
 type LoginRequest struct {
 	Username string `json:"username,omitempty"`
 	Password string `json:"password,omitempty"`
@@ -229,56 +281,3 @@ func TestOptional(t *testing.T) {
 		t.Fatalf("got %s", query.Encode())
 	}
 }
-
-type testFormTagName struct {
-	Name string `form:"name_form" json:"name_json"`
-}
-
-func TestFormEncoderAndDecoder(t *testing.T) {
-	t.Cleanup(func() {
-		encoder.SetTagName(tagName)
-		decoder.SetTagName(tagName)
-	})
-
-	encoder.SetTagName(tagNameTest)
-	decoder.SetTagName(tagNameTest)
-
-	v, err := encoder.Encode(&testFormTagName{
-		Name: "test tag name",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	jsonName := v.Get("name_json")
-	formName := v.Get("name_form")
-	switch tagNameTest {
-	case "json":
-		if jsonName != "test tag name" {
-			t.Errorf("got: %s", jsonName)
-		}
-		if formName != "" {
-			t.Errorf("want: empty, got: %s", formName)
-		}
-	case "form":
-		if formName != "test tag name" {
-			t.Errorf("got: %s", formName)
-		}
-		if jsonName != "" {
-			t.Errorf("want: empty, got: %s", jsonName)
-		}
-	default:
-		t.Fatalf("unknown tag name: %s", tagNameTest)
-	}
-
-	var tn *testFormTagName
-	err = decoder.Decode(&tn, v)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if tn == nil {
-		t.Fatal("nil tag name")
-	}
-	if tn.Name != "test tag name" {
-		t.Errorf("got %s", tn.Name)
-	}
-}