diff --git a/tests/datasets/http/multipart-file.httpinput b/tests/datasets/http/multipart-file.httpinput
new file mode 100644
index 000000000..a1bc0de31
Binary files /dev/null and b/tests/datasets/http/multipart-file.httpinput differ
diff --git a/tests/src/Util/HTTPInputDataTest.php b/tests/src/Util/HTTPInputDataTest.php
index 8f05703b2..6bcc42a86 100644
--- a/tests/src/Util/HTTPInputDataTest.php
+++ b/tests/src/Util/HTTPInputDataTest.php
@@ -64,6 +64,42 @@ class HTTPInputDataTest extends MockedTest
 					'files' => []
 				]
 			],
+			'multipart-file' => [
+				'contenttype' => 'multipart/form-data;boundary=6d4d5a40-651a-4468-a62e-5a6ca2bf350d;charset=utf8',
+				'input'       => file_get_contents(__DIR__ . '/../../datasets/http/multipart.httpinput'),
+				'expected'    => [
+					'variables' => [
+						'display_name'      => 'Vorname Nachname',
+						'note'              => 'About me',
+						'fields_attributes' => [
+							0 => [
+								'name'  => 'variable 1',
+								'value' => 'value 1',
+							],
+							1 => [
+								'name'  => 'variable 2',
+								'value' => 'value 2',
+							]
+						]
+					],
+					'files' => [
+						'avatar' => [
+							'name' => '8ZUCS34Y5XNH',
+							'type' => 'image/png',
+							'tmp_name' => '/tmp/phpf85nKJ',
+							'error' => 0,
+							'size' => 349330
+						],		
+						'header' => [
+							'name' => 'V2B6Z1IICGPM',
+							'type' => 'image/png',
+							'tmp_name' => '/tmp/phpe3sqHT',
+							'error' => 0,
+							'size' => 1323635
+						]
+					]
+				]
+			],
 			'form-urlencoded' => [
 				'contenttype' => 'application/x-www-form-urlencoded;charset=utf8',
 				'input'       => file_get_contents(__DIR__ . '/../../datasets/http/form-urlencoded.httpinput'),