diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index 07da244b35..3589d762be 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -135,9 +135,8 @@ formPanel
     ),
     formGroup
     (
-        set::name('files[]'),
         set::label($lang->bug->files),
-        set::control('file')
+        upload()
     ),
     formGroup
     (
diff --git a/module/caselib/ui/createcase.html.php b/module/caselib/ui/createcase.html.php
index b364f02141..2ac3a25af6 100644
--- a/module/caselib/ui/createcase.html.php
+++ b/module/caselib/ui/createcase.html.php
@@ -143,8 +143,7 @@ formPanel
         formGroup
         (
             set::label($lang->testcase->files),
-            set::name('files[]'),
-            set::control('file')
+            upload()
         )
     )
 );
diff --git a/module/testcase/ui/create.html.php b/module/testcase/ui/create.html.php
index 44a556b503..06fbe709c2 100644
--- a/module/testcase/ui/create.html.php
+++ b/module/testcase/ui/create.html.php
@@ -233,8 +233,7 @@ formPanel
         formGroup
         (
             set::label($lang->testcase->files),
-            set::name('files[]'),
-            set::control('file')
+            upload()
         )
     )
 );
diff --git a/module/testreport/ui/create.html.php b/module/testreport/ui/create.html.php
index 4e4ec12d6e..9e5125d921 100644
--- a/module/testreport/ui/create.html.php
+++ b/module/testreport/ui/create.html.php
@@ -165,8 +165,7 @@ formPanel
         formGroup
         (
             set::label($lang->files),
-            set::name('files[]'),
-            set::control('file')
+            upload()
         )
     )
 );
diff --git a/module/testreport/ui/edit.html.php b/module/testreport/ui/edit.html.php
index fdea7999ca..2c21aeb9d1 100644
--- a/module/testreport/ui/edit.html.php
+++ b/module/testreport/ui/edit.html.php
@@ -139,8 +139,7 @@ formPanel
         formGroup
         (
             set::label($lang->files),
-            set::name('files[]'),
-            set::control('file')
+            upload()
         )
     )
 );
diff --git a/module/testtask/ui/create.html.php b/module/testtask/ui/create.html.php
index f6a5a3d616..be9f9e575b 100644
--- a/module/testtask/ui/create.html.php
+++ b/module/testtask/ui/create.html.php
@@ -165,8 +165,7 @@ formPanel
     formGroup
     (
         set::label($lang->testtask->files),
-        set::name('files[]'),
-        set::control('file')
+        upload()
     ),
     formGroup
     (
diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php
index b959120538..de7a7509c4 100644
--- a/module/testtask/ui/edit.html.php
+++ b/module/testtask/ui/edit.html.php
@@ -133,8 +133,7 @@ formPanel
     formGroup
     (
         set::label($lang->testtask->files),
-        set::name('files[]'),
-        set::control('file')
+        upload()
     ),
     formGroup
     (