diff --git a/library/Zend/Form/Element/Upload/ApcProgress.php b/library/Zend/Form/Element/File/ApcProgress.php
similarity index 96%
rename from library/Zend/Form/Element/Upload/ApcProgress.php
rename to library/Zend/Form/Element/File/ApcProgress.php
index 0e0624bbc50..4717d24aff3 100644
--- a/library/Zend/Form/Element/Upload/ApcProgress.php
+++ b/library/Zend/Form/Element/File/ApcProgress.php
@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Form\Element\Upload;
+namespace Zend\Form\Element\File;
 
 /**
  * @category   Zend
diff --git a/library/Zend/Form/Element/Upload/SessionProgress.php b/library/Zend/Form/Element/File/SessionProgress.php
similarity index 97%
rename from library/Zend/Form/Element/Upload/SessionProgress.php
rename to library/Zend/Form/Element/File/SessionProgress.php
index af7a52f6e40..fc2cd69e11b 100644
--- a/library/Zend/Form/Element/Upload/SessionProgress.php
+++ b/library/Zend/Form/Element/File/SessionProgress.php
@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Form\Element\Upload;
+namespace Zend\Form\Element\File;
 
 /**
  * @category   Zend
diff --git a/library/Zend/Form/Element/Upload/UploadProgress.php b/library/Zend/Form/Element/File/UploadProgress.php
similarity index 97%
rename from library/Zend/Form/Element/Upload/UploadProgress.php
rename to library/Zend/Form/Element/File/UploadProgress.php
index 520cb6ce67c..aeb99db3277 100644
--- a/library/Zend/Form/Element/Upload/UploadProgress.php
+++ b/library/Zend/Form/Element/File/UploadProgress.php
@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Form\Element\Upload;
+namespace Zend\Form\Element\File;
 
 use Zend\Form\Exception;
 use Zend\Form\Element\Hidden;
diff --git a/tests/ZendTest/Form/Element/File/ApcProgressTest.php b/tests/ZendTest/Form/Element/File/ApcProgressTest.php
new file mode 100644
index 00000000000..3f44b5dc1ac
--- /dev/null
+++ b/tests/ZendTest/Form/Element/File/ApcProgressTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Form
+ */
+
+namespace ZendTest\Form\Element\File;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Form\Element\File\ApcProgress as ApcProgressElement;
+
+class ApcProgressTest extends TestCase
+{
+    public function setUp()
+    {
+        if (false === ini_get('apc.rfc1867_name')) {
+            $this->markTestSkipped('APC module is not active');
+        }
+    }
+
+    public function testAlwaysReturnsApcName()
+    {
+        $name = ini_get('apc.rfc1867_name');
+        $element = new ApcProgressElement('foo');
+        $this->assertEquals($name, $element->getName());
+        $element->setName('bar');
+        $this->assertEquals($name, $element->getName());
+    }
+
+    public function testValueIsPopulatedWithUniqueId()
+    {
+        $element = new ApcProgressElement();
+        $value1 = $element->getValue();
+        $this->assertNotEmpty($value1);
+        $element->setValue(null);
+        $value2 = $element->getValue();
+        $this->assertNotEmpty($value2);
+        $this->assertNotEquals($value2, $value1);
+    }
+}
diff --git a/tests/ZendTest/Form/Element/File/SessionProgressTest.php b/tests/ZendTest/Form/Element/File/SessionProgressTest.php
new file mode 100644
index 00000000000..0b2a8460890
--- /dev/null
+++ b/tests/ZendTest/Form/Element/File/SessionProgressTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Form
+ */
+
+namespace ZendTest\Form\Element\File;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Form\Element\File\SessionProgress as SessionProgressElement;
+
+class SessionProgressTest extends TestCase
+{
+    public function setUp()
+    {
+        if (false === ini_get('session.upload_progress.name')) {
+            $this->markTestSkipped('Session Upload Progress feature is not active');
+        }
+    }
+
+    public function testAlwaysReturnsSessionName()
+    {
+        $name = ini_get('session.upload_progress.name');
+        $element = new SessionProgressElement('foo');
+        $this->assertEquals($name, $element->getName());
+        $element->setName('bar');
+        $this->assertEquals($name, $element->getName());
+    }
+
+    public function testValueIsPopulatedWithUniqueId()
+    {
+        $element = new SessionProgressElement();
+        $value1 = $element->getValue();
+        $this->assertNotEmpty($value1);
+        $element->setValue(null);
+        $value2 = $element->getValue();
+        $this->assertNotEmpty($value2);
+        $this->assertNotEquals($value2, $value1);
+    }
+}
diff --git a/tests/ZendTest/Form/Element/File/UploadProgressTest.php b/tests/ZendTest/Form/Element/File/UploadProgressTest.php
new file mode 100644
index 00000000000..21210e7e882
--- /dev/null
+++ b/tests/ZendTest/Form/Element/File/UploadProgressTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Form
+ */
+
+namespace ZendTest\Form\Element\File;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Form\Element\File\UploadProgress as UploadProgressElement;
+
+class UploadProgressTest extends TestCase
+{
+    public function testAlwaysReturnsUploadIdName()
+    {
+        $name = 'UPLOAD_IDENTIFIER';
+        $element = new UploadProgressElement('foo');
+        $this->assertEquals($name, $element->getName());
+        $element->setName('bar');
+        $this->assertEquals($name, $element->getName());
+    }
+
+    public function testValueIsPopulatedWithUniqueId()
+    {
+        $element = new UploadProgressElement();
+        $value1 = $element->getValue();
+        $this->assertNotEmpty($value1);
+        $element->setValue(null);
+        $value2 = $element->getValue();
+        $this->assertNotEmpty($value2);
+        $this->assertNotEquals($value2, $value1);
+    }
+}