diff --git a/tests/webform_zip_exporter.test b/tests/webform_zip_exporter.test
index 71d0f2a..a17fc23 100644
--- a/tests/webform_zip_exporter.test
+++ b/tests/webform_zip_exporter.test
@@ -18,7 +18,7 @@ class WebformZipExporter extends DrupalWebTestCase  {
   protected $modules = array(
     'file',
     'webform',
-    'webform_multifile',
+    'webform_multiple_file',
     'webform_zip_exporter',
   );
 
@@ -92,7 +92,7 @@ class WebformZipExporter extends DrupalWebTestCase  {
     $this->assertFileContents('two_submissions/files/example_file_B.txt', 'example file B');
 
     // Test with a different number of components.
-    $this->exportAndExtractZip('variable_components', array('header_keys' => -1, 'components[webform_draft]' => TRUE));
+    $this->exportAndExtractZip('variable_components', array('header_keys' => -1));
     $this->assertFileContents('variable_components/submissions.csv', '"public://example_file_A.txt","Example Name"
 "public://example_file_B.txt","Second Submission"');
     $this->assertFileContents('variable_components/files/example_file_A.txt', 'example file A');
@@ -100,20 +100,18 @@ class WebformZipExporter extends DrupalWebTestCase  {
   }
 
   /**
-   * Test the integration with webform multifile.
-   *
-   * @todo
+   * Test the integration with webform_multiple_file.
    */
-  public function _testWebformMultifileIntegration() {
+  public function testWebformMultipleFilesIntegration() {
     $this->testWebform = $this->createTestWebform(array(array(
-      'name' => 'Multifile',
-      'form_key' => 'multifile',
-      'type' => 'multifile',
+      'name' => 'Multiple File',
+      'form_key' => 'multiple_file',
+      'type' => 'multiple_file',
       'mandatory' => 1,
       'weight' => 0,
       'pid' => 0,
       'extra' => array(
-        'max_amount' => -1,
+        'cardinality' => -1,
         'scheme' => 'public',
         'filtering' => array(
           'size' => '2 MB',
@@ -123,7 +121,21 @@ class WebformZipExporter extends DrupalWebTestCase  {
         ),
       ),
     )));
+
     $this->drupalGet('node/' . $this->testWebform->nid);
+    $this->drupalPostAJAX(NULL, array('submitted[multiple_file][0][fid]' => $this->createManagedFile('example_file_A.txt')->fid), 'submitted_multiple_file_0_upload_button');
+    $this->drupalPostAJAX(NULL, array('submitted[multiple_file][1][fid]' => $this->createManagedFile('example_file_B.txt')->fid), 'submitted_multiple_file_1_upload_button');
+    $this->drupalPost(NULL, array(), 'Submit');
+
+    $this->exportAndExtractZip('multi_file_submissions', array(
+      'header_keys' => -1,
+      'components[1]' => FALSE,
+      'components[2]' => FALSE,
+      'components[3]' => FALSE,
+    ));
+    $this->assertFileContents('multi_file_submissions/submissions.csv', '"public://example_file_A.txt, public://example_file_B.txt"');
+    $this->assertFileContents('multi_file_submissions/files/example_file_A.txt', 'example file A');
+    $this->assertFileContents('multi_file_submissions/files/example_file_B.txt', 'example file B');
   }
 
   /**
diff --git a/webform_zip_exporter.module b/webform_zip_exporter.module
index 912eea9..68cdeb1 100644
--- a/webform_zip_exporter.module
+++ b/webform_zip_exporter.module
@@ -43,10 +43,17 @@ function webform_zip_exporter_webform_results_download_submission_information_da
   }
   $file_uris = array();
   foreach (node_load($submission->nid)->webform['components'] as $cid => $component) {
-    if ($component['type'] !== 'file' || !isset($submission->data[$cid])) {
+    if (!isset($submission->data[$cid])) {
       continue;
     }
-    $file_uris[] = file_load($submission->data[$cid][0])->uri;
+    if ($component['type'] === 'file') {
+      $file_uris[] = file_load($submission->data[$cid][0])->uri;
+    }
+    if ($component['type'] === 'multiple_file') {
+      foreach ($submission->data[$cid] as $file_id) {
+        $file_uris[] = file_load($file_id)->uri;
+      }
+    }
   }
   return $file_uris;
 }